- test.wc.test_util: added testcase for wc_parent

In a non-standard package hierarchy, wc_parent should resolve to the
correct parent working copy. Note: such a hierarchy is not created by
default.

test/wc/test_util.py

@@ -214,6 +214,18 @@ def test29(self):
         par_dir = wc_parent(path)
         self.assertIsNone(par_dir)
 
+    def test30(self):
+        """test wc_parent in non-standard hierarchy"""
+        # currently, such a hierarchy is not created by osc2
+        # but we should resolve the parent with the help of
+        # the storedir link
+        path = self.fixture_file('prj1', 'hierarchy', 'non-standard')
+        self.assertTrue(wc_is_package(path))
+        par_dir = wc_parent(path)
+        self.assertIsNotNone(par_dir)
+        self.assertTrue(wc_is_project(par_dir))
+        self.assertEqual(wc_read_project(par_dir), 'prj1')
+
     def test_wc_init1(self):
         """simple init wc"""
         path = self.fixture_file('init')

test/wc/test_util_fixtures/prj1/.osc/_packages

@@ -1,4 +1,5 @@
 <packages>
   <package name="added" state="A"/>
   <package name="missing" state="D"/>
+  <package name="non-standard" state=" "/>
 </packages>

test/wc/test_util_fixtures/prj1/.osc/data/non-standard/_apiurl

@@ -0,0 +1 @@
+http://apiurl

test/wc/test_util_fixtures/prj1/.osc/data/non-standard/_files

@@ -0,0 +1,3 @@
+<directory name="non-standard" rev="87" srcmd5="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">
+  <entry name="dummy" md5="809db8de8a84816fd23862786baa1d75" mtime="1310328970" size="31"/>
+</directory>

test/wc/test_util_fixtures/prj1/.osc/data/non-standard/_package

@@ -0,0 +1 @@
+non-standard

test/wc/test_util_fixtures/prj1/.osc/data/non-standard/_project

@@ -0,0 +1 @@
+prj1

test/wc/test_util_fixtures/prj1/.osc/data/non-standard/data/dummy

@@ -0,0 +1 @@
+dummy file (to make git happy)

test/wc/test_util_fixtures/prj1/hierarchy/non-standard/.osc

@@ -0,0 +1 @@
+../../.osc/data/non-standard