[DRE-commits] [ruby-dep-selector] 16/17: Patch: make tests RSpec3 compatible
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Thu Jun 25 21:36:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository ruby-dep-selector.
commit fe343301b32bbe79d8f709d9f9b8d3a2342591b9
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Thu Jun 25 23:59:24 2015 +0300
Patch: make tests RSpec3 compatible
---
.../0005-Make-tests-rspec3-compatible.patch | 60 ++++++++++++++++++++++
debian/patches/series | 2 +
2 files changed, 62 insertions(+)
diff --git a/debian/patches/0005-Make-tests-rspec3-compatible.patch b/debian/patches/0005-Make-tests-rspec3-compatible.patch
new file mode 100644
index 0000000..6a3e976
--- /dev/null
+++ b/debian/patches/0005-Make-tests-rspec3-compatible.patch
@@ -0,0 +1,60 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Thu, 25 Jun 2015 21:21:14 +0300
+Subject: Make tests rspec3 compatible
+
+---
+ spec/dep_gecode_spec.rb | 2 +-
+ spec/dep_selector/dependency_graph_spec.rb | 4 ++--
+ spec/dep_selector/error_reporter/simple_tree_traverser_spec.rb | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/spec/dep_gecode_spec.rb b/spec/dep_gecode_spec.rb
+index 0a3b432..68ddecd 100644
+--- a/spec/dep_gecode_spec.rb
++++ b/spec/dep_gecode_spec.rb
+@@ -105,7 +105,7 @@ def check_solution(problem, pkg_name_to_id, dep_graph, expected_solution)
+ version_text = package.densely_packed_versions.sorted_elements[package_version]
+ expected_version = expected_solution.nil? ? "NA" : expected_solution[package.name]
+ if (expected_version == "disabled")
+- Dep_gecode.GetPackageDisabledState(problem,package_id).should be_true
++ expect(Dep_gecode.GetPackageDisabledState(problem,package_id)).to be_truthy
+ else
+ version_text.to_s.should == expected_version.to_s
+ end
+diff --git a/spec/dep_selector/dependency_graph_spec.rb b/spec/dep_selector/dependency_graph_spec.rb
+index 942615f..0868bfe 100644
+--- a/spec/dep_selector/dependency_graph_spec.rb
++++ b/spec/dep_selector/dependency_graph_spec.rb
+@@ -60,12 +60,12 @@ describe DepSelector::DependencyGraph do
+ copied_package_a.should_not equal(original_pkg_a)
+
+ copy.package("A").dependency_graph.should equal(copy)
+- copy.package("A").should have(1).versions
++ expect(copy.package("A").versions.size).to eq(1)
+ copied_pkg_a_v1_0_0 = copy.package("A").versions.first
+ copied_pkg_a_v1_0_0.package.should equal(copied_package_a)
+
+ copied_package_b_v2_0_0 = copied_package_b.versions.first
+- copied_package_b_v2_0_0.should have(1).dependencies
++ expect(copied_package_b_v2_0_0.dependencies.size).to eq(1)
+
+ copied_dependency = copied_package_b_v2_0_0.dependencies.first
+ copied_dependency.package.should equal(copied_package_a)
+diff --git a/spec/dep_selector/error_reporter/simple_tree_traverser_spec.rb b/spec/dep_selector/error_reporter/simple_tree_traverser_spec.rb
+index 9b49d73..0549f70 100644
+--- a/spec/dep_selector/error_reporter/simple_tree_traverser_spec.rb
++++ b/spec/dep_selector/error_reporter/simple_tree_traverser_spec.rb
+@@ -173,11 +173,11 @@ describe DepSelector::ErrorReporter::SimpleTreeTraverser do
+ describe "collapse" do
+
+ it "should collapse two neighbors that have only one difference in the path" do
+- pending
++ skip
+ end
+
+ it "should not collapse neighbors that are only different at the constraint on the target package" do
+- pending
++ skip
+ end
+
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 5646697..7f82ec2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
0001-Do-not-require-dep-selector-libgecode.patch
0002-Port-to-libgecode-4.0-Closes-710104.patch
0003-Do-not-set-rpath.patch
+0004-Make-it-solve-2.0-compatible.patch
+0005-Make-tests-rspec3-compatible.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-dep-selector.git
More information about the Pkg-ruby-extras-commits
mailing list