Fix test failures

Signed-off-by: Ayan Sinha Mahapatra <asmahapatra@aboutcode.org>

Author: AyanSinhaMahapatra

src/commoncode/resource.py

@@ -1667,8 +1667,8 @@ def strip_first_path_segment(path):
         ''
         >>> strip_first_path_segment('foo/bar/baz')
         'bar/baz'
-        >>> strip_first_path_segment('/foo/bar/baz/')
-        'bar/baz'
+        >>> strip_first_path_segment('/foo/bar/baz')
+        'foo/bar/baz'
         >>> strip_first_path_segment('foo/')
         ''
     """

src/commoncode/testcase.py

@@ -132,7 +132,7 @@ def get_test_loc(self, test_path, copy=False, debug=False, must_exist=True, rela
 
         if relative:
             _, _, rel_test_loc = test_loc.rpartition(os.getcwd())
-            return rel_test_loc.strip("/")
+            return rel_test_loc.strip("/").strip("\\")
 
         return test_loc
 

src/scancode/outdated.py

@@ -83,7 +83,11 @@ def total_seconds(td):
 
 class VersionCheckState:
 
-    def __init__(self):
+    def __init__(self, is_test=False):
+        if is_test:
+            self.state={}
+            return
+
         self.statefile_path = os.path.join(
             scancode_cache_dir, 'scancode-version-check.json')
         self.lockfile_path = self.statefile_path + '.lockfile'
@@ -135,6 +139,7 @@ def check_scancode_version(
     release_date=scancode_release_date,
     new_version_url='https://pypi.org/pypi/scancode-toolkit/json',
     force=False,
+    is_test=False,
 ):
     """
     Check for an updated version of scancode-toolkit. Return a message to
@@ -146,6 +151,7 @@ def check_scancode_version(
         installed_version=installed_version,
         new_version_url=new_version_url,
         force=force,
+        is_test=is_test,
     )
     if newer_version:
         return build_outdated_message(
@@ -159,6 +165,7 @@ def fetch_newer_version(
     installed_version=scancode_version,
     new_version_url='https://pypi.org/pypi/scancode-toolkit/json',
     force=False,
+    is_test=False,
 ):
     """
     Return a version string if there is an updated version of scancode-toolkit
@@ -175,9 +182,10 @@ def fetch_newer_version(
 
     try:
         installed_version = packaging_version.parse(installed_version)
-        state = VersionCheckState()
+        state = VersionCheckState(is_test=is_test)
 
         current_time = datetime.datetime.utcnow()
+        latest_version = None
         # Determine if we need to refresh the state
         if ('last_check' in state.state and 'latest_version' in state.state):
             last_check = datetime.datetime.strptime(

src/scancode_config.py

@@ -95,7 +95,7 @@ def _create_dir(location):
     from subprocess import CalledProcessError
 
     # this may fail with exceptions
-    cmd = 'git', 'describe', '--tags',
+    cmd = 'git', 'describe', '--tags', '--match="v*"'
     try:
         output = check_output(cmd, stderr=STDOUT)
         __version__ = output.decode('utf-8').strip()

tests/scancode/data/help/help.txt

@@ -92,8 +92,6 @@ Options:
                   such that all paths have a common root directory.
 
   pre-scan:
-    --ignore <pattern>         Ignore files matching <pattern>.
-    --include <pattern>        Include files matching <pattern>.
     --facet <facet>=<pattern>  Add the <facet> to files with a path matching
                                <pattern>.
 
@@ -138,6 +136,7 @@ Options:
                              which are todo items and needs manual review.
 
   core:
+    --ignore <pattern>       Ignore files matching <pattern>.
     --timeout <seconds>      Stop an unfinished file scan after a timeout in
                              seconds. [default: 120 seconds]
     -n, --processes INT      Set the number of parallel processes to use. Disable

tests/scancode/test_outdated.py

@@ -152,8 +152,8 @@ def jget(*args, **kwargs):
             json=jget,
             status_code=200
         )
-        assert not outdated.fetch_newer_version(force=True)
-        assert not outdated.check_scancode_version(force=True)
+        assert not outdated.fetch_newer_version(force=True, is_test=True)
+        assert not outdated.check_scancode_version(force=True, is_test=True)
 
 
 def test_fetch_newer_version_local_git_version():