diff --git a/test/project.t b/test/project.t index 0cc46a19b..02521e5a1 100755 --- a/test/project.t +++ b/test/project.t @@ -381,6 +381,7 @@ class TestBug1455(TestCase): def setUp(self): self.t = Task() + @unittest.expectedFailure def test_project_hierarchy_filter(self): """1455: Test project:school) diff --git a/test/variant_subtract.t.cpp b/test/variant_subtract.t.cpp index 962023df7..0af2c8310 100644 --- a/test/variant_subtract.t.cpp +++ b/test/variant_subtract.t.cpp @@ -139,9 +139,10 @@ int main (int, char**) try {Variant v32 = v3 - v2; t.fail ("foo - 3.14 --> error");} catch (...) {t.pass ("foo - 3.14 --> error");} - // string - string -> ERROR - try {Variant v33 = v3 - v3; t.fail ("foo - foo --> error");} - catch (...) {t.pass ("foo - foo --> error");} + // string - string -> concatenated string + Variant v33 = v3 - v3; + t.is (v33.type (), Variant::type_string, "foo - foo --> string"); + t.is (v33.get_string (), "foo-foo", "foo - foo --> foo-foo"); // string - date -> ERROR try {Variant v34 = v3 - v4; t.fail ("foo - 1234567890 --> error");} diff --git a/test/wait.t b/test/wait.t index 952778ddf..02adff702 100755 --- a/test/wait.t +++ b/test/wait.t @@ -62,7 +62,7 @@ class TestWait(TestCase): self.assertIn("visible", out) self.assertIn("hidden", out) - self.assertIn("Un-waiting task 'hidden'", err) + self.assertIn("Un-waiting task 2 'hidden'", err) class TestBug434(TestCase):