summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-03-03 18:39:44 -0800
committerMatt Robinson <matt@puppetlabs.com>2011-03-03 18:39:44 -0800
commit6869385300dc694c4f087e134949dff9e1e43df9 (patch)
tree4a5e3129a0c8e750705efb1115abb992b40c086e
parent919dd9bde52c2d1d302a0924fb6822b5c0db1656 (diff)
parent124ff3c17c6c6b1ac1b1b6af21e269d5b4f9f222 (diff)
downloadpuppet-6869385300dc694c4f087e134949dff9e1e43df9.tar.gz
puppet-6869385300dc694c4f087e134949dff9e1e43df9.tar.xz
puppet-6869385300dc694c4f087e134949dff9e1e43df9.zip
Merge branch 'ticket/next/maint-fix_test_randomization_problem' into next
* ticket/next/maint-fix_test_randomization_problem: maint: Fix a randomization test failure
-rwxr-xr-xspec/unit/simple_graph_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/unit/simple_graph_spec.rb b/spec/unit/simple_graph_spec.rb
index 2c6af063b..c106f550b 100755
--- a/spec/unit/simple_graph_spec.rb
+++ b/spec/unit/simple_graph_spec.rb
@@ -305,7 +305,9 @@ describe Puppet::SimpleGraph do
it "should produce the correct relationship text" do
add_edges :a => :b, :b => :a
- want = %r{Found 1 dependency cycle:\n\(a => b => a\)\nTry}
+ # cycle detection starts from a or b randomly
+ # so we need to check for either ordering in the error message
+ want = %r{Found 1 dependency cycle:\n\((a => b => a|b => a => b)\)\nTry}
expect { @graph.topsort }.to raise_error(Puppet::Error, want)
end