Skip to content

Commit 17ee8d5

Browse files
jonahjnewtonjonahjnewton
committed
Unittests without python req
Signed-off-by: Jonah Newton <jonah@jonahnewton.com.au>
1 parent cd10edd commit 17ee8d5

1 file changed

Lines changed: 48 additions & 0 deletions

File tree

‎src/rez/tests/test_solver.py‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,9 @@ def test_15_version_priority_extra_packages(self):
291291
["python-2.7.0[]","test_prio_lower_extra_package-1.0[1]", "nada[]"], )
292292
self._solve(["test_prio_lower_extra_package", "nada", "python"],
293293
["nada[]", "python-2.6.0[]","test_prio_lower_extra_package-1.0[0]"], )
294+
self._solve(["test_prio_lower_extra_package", "nada"],
295+
["nada[]", "python-2.6.0[]","test_prio_lower_extra_package-1.0[0]"],
296+
perms_same_packages=True)
294297

295298
self._solve(["test_prio_higher_extra_package"],
296299
["nada[]", "python-2.7.0[]", "test_prio_higher_extra_package-1.0[1]"],
@@ -301,6 +304,9 @@ def test_15_version_priority_extra_packages(self):
301304
self._solve(["test_prio_higher_extra_package", "python", "nada"],
302305
["python-2.7.0[]", "nada[]", "test_prio_higher_extra_package-1.0[1]"],
303306
perms_same_packages=True)
307+
self._solve(["test_prio_higher_extra_package", "nada"],
308+
["nada[]", "python-2.7.0[]", "test_prio_higher_extra_package-1.0[1]"],
309+
perms_same_packages=True)
304310

305311
self._solve(["test_prio_both_extra_package"],
306312
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package-1.0[1]"],
@@ -311,6 +317,9 @@ def test_15_version_priority_extra_packages(self):
311317
self._solve(["test_prio_both_extra_package", "python", "nada"],
312318
["python-2.7.0[]", "nada[]", "test_prio_both_extra_package-1.0[1]"],
313319
perms_same_packages=True)
320+
self._solve(["test_prio_both_extra_package", "nada"],
321+
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package-1.0[1]"],
322+
perms_same_packages=True)
314323

315324
self._solve(["test_prio_both_base"],
316325
["python-2.7.0[]", "test_prio_both_base-1.0[1]"],
@@ -321,6 +330,9 @@ def test_15_version_priority_extra_packages(self):
321330
self._solve(["test_prio_both_base", "python", "nada"],
322331
["python-2.7.0[]", "test_prio_both_base-1.0[1]", "nada[]"],
323332
perms_same_packages=True)
333+
self._solve(["test_prio_both_base", "nada"],
334+
["python-2.7.0[]", "test_prio_both_base-1.0[1]", "nada[]"],
335+
perms_same_packages=True)
324336

325337
self._solve(["test_prio_lower_extra_package_reverse"],
326338
["python-2.7.0[]", "test_prio_lower_extra_package_reverse-1.0[0]"],
@@ -332,6 +344,9 @@ def test_15_version_priority_extra_packages(self):
332344
["python-2.7.0[]","test_prio_lower_extra_package_reverse-1.0[0]", "nada[]"], )
333345
self._solve(["test_prio_lower_extra_package_reverse", "nada", "python"],
334346
["nada[]", "python-2.6.0[]","test_prio_lower_extra_package_reverse-1.0[1]"], )
347+
self._solve(["test_prio_lower_extra_package_reverse", "nada"],
348+
["nada[]", "python-2.6.0[]","test_prio_lower_extra_package_reverse-1.0[1]"],
349+
perms_same_packages=True)
335350

336351
self._solve(["test_prio_higher_extra_package_reverse"],
337352
["nada[]", "python-2.7.0[]", "test_prio_higher_extra_package_reverse-1.0[0]"],
@@ -342,6 +357,9 @@ def test_15_version_priority_extra_packages(self):
342357
self._solve(["test_prio_higher_extra_package_reverse", "python", "nada"],
343358
["python-2.7.0[]", "nada[]", "test_prio_higher_extra_package_reverse-1.0[0]"],
344359
perms_same_packages=True)
360+
self._solve(["test_prio_higher_extra_package_reverse", "nada"],
361+
["nada[]", "python-2.7.0[]", "test_prio_higher_extra_package_reverse-1.0[0]"],
362+
perms_same_packages=True)
345363

346364
self._solve(["test_prio_both_extra_package_reverse"],
347365
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package_reverse-1.0[0]"],
@@ -352,6 +370,9 @@ def test_15_version_priority_extra_packages(self):
352370
self._solve(["test_prio_both_extra_package_reverse", "python", "nada"],
353371
["python-2.7.0[]", "nada[]", "test_prio_both_extra_package_reverse-1.0[0]"],
354372
perms_same_packages=True)
373+
self._solve(["test_prio_both_extra_package_reverse", "nada"],
374+
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package_reverse-1.0[0]"],
375+
perms_same_packages=True)
355376

356377
self._solve(["test_prio_both_base_reverse"],
357378
["python-2.7.0[]", "test_prio_both_base_reverse-1.0[0]"],
@@ -362,6 +383,9 @@ def test_15_version_priority_extra_packages(self):
362383
self._solve(["test_prio_both_base_reverse", "python", "nada"],
363384
["python-2.7.0[]", "test_prio_both_base_reverse-1.0[0]", "nada[]"],
364385
perms_same_packages=True)
386+
self._solve(["test_prio_both_base_reverse", "nada"],
387+
["python-2.7.0[]", "test_prio_both_base_reverse-1.0[0]", "nada[]"],
388+
perms_same_packages=True)
365389

366390
def test_16_intersection_priority_extra_packages(self):
367391
config.override("variant_select_mode", "intersection_priority")
@@ -376,6 +400,9 @@ def test_16_intersection_priority_extra_packages(self):
376400
["python-2.6.0[]", "nada[]", "test_prio_lower_extra_package-1.0[0]"])
377401
self._solve(["python", "test_prio_lower_extra_package", "nada"],
378402
["python-2.7.0[]", "test_prio_lower_extra_package-1.0[1]", "nada[]"])
403+
self._solve(["test_prio_lower_extra_package", "nada"],
404+
["nada[]", "python-2.6.0[]", "test_prio_lower_extra_package-1.0[0]"],
405+
perms_same_packages=True)
379406

380407
self._solve(["test_prio_higher_extra_package"],
381408
["python-2.6.0[]", "test_prio_higher_extra_package-1.0[0]"],
@@ -388,6 +415,9 @@ def test_16_intersection_priority_extra_packages(self):
388415
["python-2.7.0[]", "nada[]", "test_prio_higher_extra_package-1.0[1]"])
389416
self._solve(["python", "test_prio_higher_extra_package", "nada"],
390417
["python-2.7.0[]", "nada[]", "test_prio_higher_extra_package-1.0[1]"])
418+
self._solve(["test_prio_higher_extra_package", "nada"],
419+
["nada[]", "python-2.7.0[]", "test_prio_higher_extra_package-1.0[1]"],
420+
perms_same_packages=True)
391421

392422
self._solve(["test_prio_both_extra_package"],
393423
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package-1.0[1]"],
@@ -400,6 +430,9 @@ def test_16_intersection_priority_extra_packages(self):
400430
["python-2.7.0[]", "nada[]", "test_prio_both_extra_package-1.0[1]"])
401431
self._solve(["test_prio_both_extra_package", "nada", "python"],
402432
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package-1.0[1]"])
433+
self._solve(["test_prio_both_extra_package", "nada"],
434+
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package-1.0[1]"],
435+
perms_same_packages=True)
403436

404437
self._solve(["test_prio_both_base"],
405438
["python-2.7.0[]", "test_prio_both_base-1.0[1]"],
@@ -412,6 +445,9 @@ def test_16_intersection_priority_extra_packages(self):
412445
["python-2.7.0[]", "test_prio_both_base-1.0[1]", "nada[]"])
413446
self._solve(["python", "test_prio_both_base", "nada"],
414447
["python-2.7.0[]", "test_prio_both_base-1.0[1]", "nada[]"])
448+
self._solve(["test_prio_both_base", "nada"],
449+
["python-2.7.0[]", "test_prio_both_base-1.0[1]", "nada[]"],
450+
perms_same_packages=True)
415451

416452
self._solve(["test_prio_lower_extra_package_reverse"],
417453
["python-2.7.0[]", "test_prio_lower_extra_package_reverse-1.0[0]"],
@@ -424,6 +460,9 @@ def test_16_intersection_priority_extra_packages(self):
424460
["python-2.6.0[]", "nada[]", "test_prio_lower_extra_package_reverse-1.0[1]"])
425461
self._solve(["python", "test_prio_lower_extra_package_reverse", "nada"],
426462
["python-2.7.0[]", "test_prio_lower_extra_package_reverse-1.0[0]", "nada[]"])
463+
self._solve(["test_prio_lower_extra_package_reverse", "nada"],
464+
["nada[]", "python-2.6.0[]", "test_prio_lower_extra_package_reverse-1.0[1]"],
465+
perms_same_packages=True)
427466

428467
self._solve(["test_prio_higher_extra_package_reverse"],
429468
["python-2.6.0[]", "test_prio_higher_extra_package_reverse-1.0[1]"],
@@ -436,6 +475,9 @@ def test_16_intersection_priority_extra_packages(self):
436475
["python-2.7.0[]", "nada[]", "test_prio_higher_extra_package_reverse-1.0[0]"])
437476
self._solve(["python", "test_prio_higher_extra_package_reverse", "nada"],
438477
["python-2.7.0[]", "nada[]", "test_prio_higher_extra_package_reverse-1.0[0]"])
478+
self._solve(["test_prio_higher_extra_package_reverse", "nada"],
479+
["nada[]", "python-2.7.0[]", "test_prio_higher_extra_package_reverse-1.0[0]"],
480+
perms_same_packages=True)
439481

440482
self._solve(["test_prio_both_extra_package_reverse"],
441483
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package_reverse-1.0[0]"],
@@ -448,6 +490,9 @@ def test_16_intersection_priority_extra_packages(self):
448490
["python-2.7.0[]", "nada[]", "test_prio_both_extra_package_reverse-1.0[0]"])
449491
self._solve(["test_prio_both_extra_package_reverse", "nada", "python"],
450492
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package_reverse-1.0[0]"])
493+
self._solve(["test_prio_both_extra_package_reverse", "nada"],
494+
["nada[]", "python-2.7.0[]", "test_prio_both_extra_package_reverse-1.0[0]"],
495+
perms_same_packages=True)
451496

452497
self._solve(["test_prio_both_base_reverse"],
453498
["python-2.7.0[]", "test_prio_both_base_reverse-1.0[0]"],
@@ -460,6 +505,9 @@ def test_16_intersection_priority_extra_packages(self):
460505
["python-2.7.0[]", "test_prio_both_base_reverse-1.0[0]", "nada[]"])
461506
self._solve(["python", "test_prio_both_base_reverse", "nada"],
462507
["python-2.7.0[]", "test_prio_both_base_reverse-1.0[0]", "nada[]"])
508+
self._solve(["test_prio_both_base_reverse", "nada"],
509+
["python-2.7.0[]", "test_prio_both_base_reverse-1.0[0]", "nada[]"],
510+
perms_same_packages=True)
463511

464512

465513
if __name__ == '__main__':

0 commit comments

Comments
 (0)