Fix test failures

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

src/licensedcode/data/rules/mediatek-proprietary-2016_1.RULE

@@ -0,0 +1,42 @@
+---
+license_expression: mediatek-proprietary-2016
+is_license_text: yes
+ignorable_copyrights:
+    - MediaTek Inc. (c)
+ignorable_holders:
+    - MediaTek Inc.
+ignorable_authors:
+    - MediaTek Inc.
+---
+
+This software/firmware and related documentation ("MediaTek Software") are
+protected under relevant copyright laws. The information contained herein
+is confidential and proprietary to MediaTek Inc. and/or its licensors.
+Without the prior written permission of MediaTek inc. and/or its licensors,
+any reproduction, modification, use or disclosure of MediaTek Software,
+and information contained herein, in whole or in part, shall be strictly prohibited.
+
+MediaTek Inc. (C) . All rights reserved.
+
+BY OPENING THIS FILE, RECEIVER HEREBY UNEQUIVOCALLY ACKNOWLEDGES AND AGREES
+THAT THE SOFTWARE/FIRMWARE AND ITS DOCUMENTATIONS ("MEDIATEK SOFTWARE")
+RECEIVED FROM MEDIATEK AND/OR ITS REPRESENTATIVES ARE PROVIDED TO RECEIVER ON
+AN "AS-IS" BASIS ONLY. MEDIATEK EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT.
+NEITHER DOES MEDIATEK PROVIDE ANY WARRANTY WHATSOEVER WITH RESPECT TO THE
+SOFTWARE OF ANY THIRD PARTY WHICH MAY BE USED BY, INCORPORATED IN, OR
+SUPPLIED WITH THE MEDIATEK SOFTWARE, AND RECEIVER AGREES TO LOOK ONLY TO SUCH
+THIRD PARTY FOR ANY WARRANTY CLAIM RELATING THERETO. RECEIVER EXPRESSLY ACKNOWLEDGES
+THAT IT IS RECEIVER'S SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES
+CONTAINED IN MEDIATEK SOFTWARE. MEDIATEK SHALL ALSO NOT BE RESPONSIBLE FOR ANY MEDIATEK
+SOFTWARE RELEASES MADE TO RECEIVER'S SPECIFICATION OR TO CONFORM TO A PARTICULAR
+STANDARD OR OPEN FORUM. RECEIVER'S SOLE AND EXCLUSIVE REMEDY AND MEDIATEK'S ENTIRE AND
+CUMULATIVE LIABILITY WITH RESPECT TO THE MEDIATEK SOFTWARE RELEASED HEREUNDER WILL BE,
+AT MEDIATEK'S OPTION, TO REVISE OR REPLACE THE MEDIATEK SOFTWARE AT ISSUE,
+OR REFUND ANY SOFTWARE LICENSE FEES OR SERVICE CHARGE PAID BY RECEIVER TO
+MEDIATEK FOR SUCH MEDIATEK SOFTWARE AT ISSUE.
+
+The following software/firmware and/or related documentation ("MediaTek Software")
+have been modified by MediaTek Inc. All revisions are subject to any receiver's
+applicable license agreements with MediaTek Inc''.

src/licensedcode/data/rules/new-relic-1.0_required_phrase_1.RULE

@@ -1,15 +1,15 @@
 ---
 license_expression: proprietary-license
 is_license_text: yes
+is_deprecated: yes
+replaced_by:
+    - mediatek-proprietary-2016
 ignorable_copyrights:
     - MediaTek Inc. (c)
 ignorable_holders:
     - MediaTek Inc.
 ignorable_authors:
     - MediaTek Inc.
-is_deprecated: yes
-replaced_by:
-    - mediatek-proprietary-2016
 ---
 
 This software/firmware and related documentation ("MediaTek Software") are

src/licensedcode/data/rules/proprietary-license_663.RULE

@@ -1,2 +1,2 @@
 license_expressions:
-  - proprietary-license
+  - mediatek-proprietary-2016

tests/licensedcode/data/datadriven/lic4/mediatek.txt.yml

@@ -1,12 +1,12 @@
 [
   [
     "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
-    180,
-    206
+    181,
+    207
   ],
   [
     "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
-    494,
-    520
+    495,
+    521
   ]
 ]

tests/licensedcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json

@@ -1,7 +1,7 @@
 [
   [
     "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception",
-    210,
-    236
+    211,
+    237
   ]
 ]

tests/licensedcode/data/spdx/lines/complex-short.html.json

@@ -1075,8 +1075,8 @@ def test_match_has_correct_line_positions_in_automake_perl_file(self):
         expected = [
             # detected, match.lines(), match.qspan,
             ('gpl-2.0-plus', (12, 25), Span(51, 160)),
-            ('fsf-unlimited-no-warranty', (231, 238), Span(979, 1042)),
-            ('warranty-disclaimer', (306, 307), Span(1352, 1374)),
+            ('fsf-unlimited-no-warranty', (231, 238), Span(984, 1047)),
+            ('warranty-disclaimer', (306, 307), Span(1357, 1379)),
         ]
         self.check_position('positions/automake.pl', expected)
 

tests/licensedcode/data/spdx/lines/complex.html.json

@@ -31133,15 +31133,15 @@
               "end_line": 1,
               "matcher": "5-undetected",
               "score": 100.0,
-              "matched_length": 1,
+              "matched_length": 2,
               "match_coverage": 100.0,
               "rule_relevance": 100,
               "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
               "matched_text": "license pubkey"
             }
           ],
-          "identifier": "unknown-215a841a-e3aa-2ed9-9dfb-b6db7f0096e1"
+          "identifier": "unknown-6638c8ac-18c2-ed3f-78bb-1c72e6cc0939"
         }
       ],
       "other_license_expression": null,
@@ -260980,15 +260980,15 @@
                   "end_line": 1,
                   "matcher": "5-undetected",
                   "score": 100.0,
-                  "matched_length": 1,
+                  "matched_length": 2,
                   "match_coverage": 100.0,
                   "rule_relevance": 100,
                   "rule_identifier": "package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
                   "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/package-manifest-unknown-b9931200c2f732e2ea95da8f66af5f41a403ecf7",
                   "matched_text": "license pubkey"
                 }
               ],
-              "identifier": "unknown-215a841a-e3aa-2ed9-9dfb-b6db7f0096e1"
+              "identifier": "unknown-6638c8ac-18c2-ed3f-78bb-1c72e6cc0939"
             }
           ],
           "other_license_expression": null,

tests/licensedcode/test_detect.py

@@ -919,7 +919,12 @@ def test_scan_keep_temp_files_is_false_by_default():
     # the SCANCODE_TEMP dir is not deleted, but it should be empty
     assert os.path.exists(temp_directory)
     # this does not make sense but that's what is seen in practice
-    expected = 2 if (on_windows or on_mac_new_py) else 1
+    if on_mac_new_py:
+        expected = 4
+    elif on_windows:
+        expected = 2
+    else:
+        expected = 1
     assert len(list(os.walk(temp_directory))) == expected
 
 
@@ -941,6 +946,12 @@ def test_scan_keep_temp_files_keeps_files():
     assert os.path.exists(temp_directory)
     # this does not make sense but that's what is seen in practice
     expected = 8 if (on_windows or on_mac_new_py) else 7
+    if on_mac_new_py:
+        expected = 10
+    elif on_windows:
+        expected = 8
+    else:
+        expected = 7
     assert len(list(os.walk(temp_directory))) == expected