Merge pull request RustPython#4134 from coolreader18/fix-cron-ci-2

fix cron ci 2

Author: coolreader18

extra_tests/custom_text_test_runner.py

@@ -247,10 +247,11 @@ def startTest(self, test):
             name_override = None
         self.case = name_override if name_override else self.case
         if self.show_test_info:
-            self.stream.writeln(self.separator2)
-            self.stream.writeln("CASE: %s" %self.case)
-            self.stream.writeln("Description: %s" %test.shortDescription())
-            self.stream.writeln(self.separator2)
+            # self.stream.writeln(self.separator2)
+            self.stream.write("CASE: %s" %self.case)
+            if desc := test.shortDescription(): self.stream.write(" (Description: %s)" % desc)
+            self.stream.write("... ")
+            # self.stream.writeln(self.separator2)
             self.stream.flush()
         self.current_case_number = self.case_number
         if self.suite not in self.suite_map:
@@ -332,7 +333,7 @@ def addScreenshots(self, test):
     def addSuccess(self, test):
         super(CustomTextTestResult, self).addSuccess(test)
         if self.show_test_info:
-            self.stream.writeln(self.separator_pre_result)
+            # self.stream.writeln(self.separator_pre_result)
             self.stream.writeln("PASS")
         self.stream.flush()
         self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'passed'
@@ -343,7 +344,7 @@ def addError(self, test, err):
         error_string = self.print_error_string(err)
         super(CustomTextTestResult, self).addError(test, err)
         if self.show_test_info:
-            self.stream.writeln(self.separator_pre_result)
+            # self.stream.writeln(self.separator_pre_result)
             self.stream.writeln("ERROR")
         self.stream.flush()
         self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'error'
@@ -355,7 +356,7 @@ def addFailure(self, test, err):
         error_string = self.print_error_string(err)
         super(CustomTextTestResult, self).addFailure(test, err)
         if self.show_test_info:
-            self.stream.writeln(self.separator_pre_result)
+            # self.stream.writeln(self.separator_pre_result)
             self.stream.writeln("FAIL")
         self.stream.flush()
         self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'failed'
@@ -366,7 +367,7 @@ def addFailure(self, test, err):
     def addSkip(self, test, reason):
         super(CustomTextTestResult, self).addSkip(test, reason)
         if self.show_test_info:
-            self.stream.writeln(self.separator_pre_result)
+            # self.stream.writeln(self.separator_pre_result)
             self.stream.writeln("SKIPPED {0!r}".format(reason))
         self.stream.flush()
         self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'skipped'
@@ -376,7 +377,7 @@ def addSkip(self, test, reason):
     def addExpectedFailure(self, test, err):
         super(CustomTextTestResult, self).addExpectedFailure(test, err)
         if self.show_test_info:
-            self.stream.writeln(self.separator_pre_result)
+            # self.stream.writeln(self.separator_pre_result)
             self.stream.writeln("EXPECTED FAILURE")
         self.stream.flush()
         self.results['suites'][self.suite_map[self.suite]]['cases'][self.current_case_number]['result'] = 'expected_failure'
@@ -386,7 +387,7 @@ def addExpectedFailure(self, test, err):
     def addUnexpectedSuccess(self, test):
         super(CustomTextTestResult, self).addUnexpectedSuccess(test)
         if self.show_test_info:
-            self.stream.writeln(self.separator_pre_result)
+            # self.stream.writeln(self.separator_pre_result)
             self.stream.writeln("UNEXPECTED SUCCESS")
         self.stream.flush()
         self.num_failed += 1

extra_tests/jsontests.py

@@ -4,6 +4,11 @@
 import os
 
 
+testnames = findtests()
+# idk why this fixes the hanging, if it does
+testnames.remove('test_importlib')
+testnames.insert(0, 'test_importlib')
+
 def loadTestsOrSkip(loader, name):
     try:
         return loader.loadTestsFromName(name)
@@ -17,13 +22,13 @@ def testSkipped(self):
         return loader.suiteClass((TestClass(name),))
 
 loader = unittest.defaultTestLoader
-suite = loader.suiteClass([loadTestsOrSkip(loader, 'test.' + name) for name in findtests()])
+suite = loader.suiteClass([loadTestsOrSkip(loader, 'test.' + name) for name in testnames])
 
 resultsfile = os.path.join(os.path.dirname(__file__), "cpython_tests_results.json")
 if os.path.exists(resultsfile):
     os.remove(resultsfile)
 
-runner = Runner(results_file_path=resultsfile)
+runner = Runner(results_file_path=resultsfile, verbosity=2)
 runner.run(suite)
 
 print("Done! results are available in", resultsfile)

vm/src/dictdatatype.rs

@@ -215,6 +215,14 @@ impl<T> DictInner<T> {
             None
         }
     }
+
+    #[inline]
+    fn get_entry_checked(&self, idx: EntryIndex, index_index: IndexIndex) -> Option<&DictEntry<T>> {
+        match self.entries.get(idx) {
+            Some(Some(entry)) if entry.index == index_index => Some(entry),
+            _ => None,
+        }
+    }
 }
 
 type PopInnerResult<T> = ControlFlow<Option<DictEntry<T>>>;
@@ -284,13 +292,8 @@ impl<T: Clone> Dict<T> {
             let (entry, index_index) = self.lookup(vm, key, hash, None)?;
             if let Some(index) = entry.index() {
                 let inner = self.read();
-                if let Some(entry) = inner.entries.get(index) {
-                    let entry = extract_dict_entry(entry);
-                    if entry.index == index_index {
-                        break Some(entry.value.clone());
-                    } else {
-                        // stuff shifted around, let's try again
-                    }
+                if let Some(entry) = inner.get_entry_checked(index, index_index) {
+                    break Some(entry.value.clone());
                 } else {
                     // The dict was changed since we did lookup. Let's try again.
                     continue;
@@ -395,13 +398,8 @@ impl<T: Clone> Dict<T> {
             let (index_entry, index_index) = lookup;
             if let Some(index) = index_entry.index() {
                 let inner = self.read();
-                if let Some(entry) = inner.entries.get(index) {
-                    let entry = extract_dict_entry(entry);
-                    if entry.index == index_index {
-                        break entry.value.clone();
-                    } else {
-                        // stuff shifted around, let's try again
-                    }
+                if let Some(entry) = inner.get_entry_checked(index, index_index) {
+                    break entry.value.clone();
                 } else {
                     // The dict was changed since we did lookup, let's try again.
                     continue;
@@ -439,13 +437,8 @@ impl<T: Clone> Dict<T> {
             let (index_entry, index_index) = lookup;
             if let Some(index) = index_entry.index() {
                 let inner = self.read();
-                if let Some(entry) = inner.entries.get(index) {
-                    let entry = extract_dict_entry(entry);
-                    if entry.index == index_index {
-                        break (entry.key.clone(), entry.value.clone());
-                    } else {
-                        // stuff shifted around, let's try again
-                    }
+                if let Some(entry) = inner.get_entry_checked(index, index_index) {
+                    break (entry.key.clone(), entry.value.clone());
                 } else {
                     // The dict was changed since we did lookup, let's try again.
                     continue;
@@ -886,12 +879,6 @@ fn str_exact<'a>(obj: &'a PyObject, vm: &VirtualMachine) -> Option<&'a PyStr> {
     }
 }
 
-fn extract_dict_entry<T>(option_entry: &Option<DictEntry<T>>) -> &DictEntry<T> {
-    option_entry
-        .as_ref()
-        .expect("The dict was changed since we did lookup.")
-}
-
 #[cfg(test)]
 mod tests {
     use super::{Dict, DictKey};