Change naming of model solutions (#291)

* Change naming of long names for model solutions * Fix test
sio2project · Nov 29, 2023 · d479668 · d479668
1 parent 951d083
commit d479668
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/oioioi/sinolpack/files/test_full_package.tgz b/oioioi/sinolpack/files/test_full_package.tgz
diff --git a/oioioi/sinolpack/package.py b/oioioi/sinolpack/package.py
@@ -1248,7 +1248,7 @@ def _get_model_solutions_sources(self):
         """
         lang_exts_list = getattr(settings, 'SUBMITTABLE_EXTENSIONS', {}).values()
         extensions = [ext for lang_exts in lang_exts_list for ext in lang_exts]
-        regex = r'^%s[0-9]*([bs]?)[0-9]*(sol.*)?\.(' + '|'.join(extensions) + ')'
+        regex = r'^%s[0-9]*([bs]?)[0-9]*(_.*)?\.(' + '|'.join(extensions) + ')'
         names_re = re.compile(regex % (re.escape(self.short_name),))
         progdir = os.path.join(self.rootdir, 'prog')
         progs = [

diff --git a/oioioi/sinolpack/tests.py b/oioioi/sinolpack/tests.py
@@ -457,7 +457,7 @@ def _check_full_package(self, problem, doc=True):
         self.assertEqual(sol1.kind, 'SLOW')
         solb0 = model_solutions.get(name='sumb0.c')
         self.assertEqual(solb0.kind, 'INCORRECT')
-        sol_long_name = model_solutions.get(name='sums2sol_very_long_name.cpp')
+        sol_long_name = model_solutions.get(name='sums2_very_long_name.cpp')
         self.assertEqual(sol_long_name.kind, 'SLOW')
         self.assertEqual(model_solutions.count(), 4)
         self.assertEqual(list(model_solutions), [sol, sol1, sol_long_name, solb0])