Fixed #276

We don't want to have the last segment of the `base_loc` to become the
root of the returned path if both `base_loc` and `full_loc` are the
same.

Author: chinyeungli

src/attributecode/util.py

@@ -160,8 +160,8 @@ def get_about_locations(location):
 def get_relative_path(base_loc, full_loc):
     """
     Return a posix path for a given full location relative to a base location.
-    The last segment of the base_loc will become the first segment of the
-    returned path.
+    The first segment of the different between full_loc and base_loc will become
+    the first segment of the returned path.
     """
     def norm(p):
         if p.startswith(UNC_PREFIX) or p.startswith(to_posix(UNC_PREFIX)):
@@ -192,8 +192,9 @@ def norm(p):
             relative = posixpath.join(parent_dir, base_name)
     else:
         relative = path[len(base) + 1:]
-        relative = posixpath.join(base_name, relative)
-
+        # We don't want to keep the first segment of the root of the returned path.
+        # See https://github.com/nexB/attributecode/issues/276
+        #relative = posixpath.join(base_name, relative)
     return relative
 
 

tests/test_model.py

@@ -1063,8 +1063,8 @@ def test_collect_inventory_in_directory_with_correct_about_file_path(self):
         _errors, abouts = model.collect_inventory(test_loc)
         assert 2 == len(abouts)
 
-        expected = ['collect-inventory-errors/non-supported_date_format.ABOUT',
-                    'collect-inventory-errors/supported_date_format.ABOUT']
+        expected = ['non-supported_date_format.ABOUT',
+                    'supported_date_format.ABOUT']
         result = [a.about_file_path for a in abouts]
         assert sorted(expected) == sorted(result)
 
@@ -1125,7 +1125,7 @@ def test_collect_inventory_populate_about_file_path(self):
         test_loc = get_test_loc('parse/complete')
         errors, abouts = model.collect_inventory(test_loc)
         assert [] == errors
-        expected = 'complete/about.ABOUT'
+        expected = 'about.ABOUT'
         result = abouts[0].about_file_path
         assert expected == result
 
@@ -1150,7 +1150,7 @@ def test_collect_inventory_works_with_relative_paths(self):
         errors2, abouts2 = model.collect_inventory(test_loc2)
         assert [] == errors1
         assert [] == errors2
-        expected = 'complete/about.ABOUT'
+        expected = 'about.ABOUT'
         result1 = abouts1[0].about_file_path
         result2 = abouts2[0].about_file_path
         assert expected == result1
@@ -1169,7 +1169,7 @@ def as_items(csvfile):
         assert expected == result
 
     def test_collect_inventory_basic_from_directory(self):
-        location = get_test_loc('inventory/basic/about')
+        location = get_test_loc('inventory/basic')
         result = get_temp_file()
         errors, abouts = model.collect_inventory(location)
 
@@ -1186,7 +1186,7 @@ def test_collect_inventory_basic_from_directory(self):
     # and do the comparson, it may be best to apply the mapping to include theses keys
     @expectedFailure
     def test_collect_inventory_complex_from_directory(self):
-        location = get_test_loc('inventory/complex/about')
+        location = get_test_loc('inventory/complex')
         result = get_temp_file()
         errors, abouts = model.collect_inventory(location)
 

tests/test_util.py

@@ -232,14 +232,14 @@ def test_is_about_file(self):
         assert not util.is_about_file('no_about_ext.something')
 
     def test_get_relative_path(self):
-        test = [('/some/path', '/some/path/file', 'path/file'),
-                ('path', '/path/file', 'path/file'),
-                ('/path', '/path/file', 'path/file'),
-                ('/path/', '/path/file/', 'path/file'),
+        test = [('/some/path', '/some/path/file', 'file'),
+                ('path', '/path/file', 'file'),
+                ('/path', '/path/file', 'file'),
+                ('/path/', '/path/file/', 'file'),
                 ('/path/', 'path/', 'path'),
-                ('/p1/p2/p3', '/p1/p2//p3/file', 'p3/file'),
-                (r'c:\some/path', 'c:/some/path/file', 'path/file'),
-                (r'c:\\some\\path\\', 'c:/some/path/file', 'path/file'),
+                ('/p1/p2/p3', '/p1/p2//p3/file', 'file'),
+                (r'c:\some/path', 'c:/some/path/file', 'file'),
+                (r'c:\\some\\path\\', 'c:/some/path/file', 'file'),
                 ]
         for base_loc, full_loc, expected in test:
             result = util.get_relative_path(base_loc, full_loc)