PYROS-IRAP / pyros

Commit a2283bf38123317a892fd851efdc66737b7b73ba

Authored by haribo
1 parent 92039557
Exists in master and in 1 other branch dev

Date: 20/05/2016 

By: Paul Carensac
Version: 0.4.2	
Ajout de la simulation aux tests du scheduler
(Attention: DB changed)
Issue (closed): https://projects.irap.omp.eu/issues/3701
Major current version (0.4): https://projects.irap.omp.eu/versions/90
Showing 2 changed files with 24 additions and 0 deletions   Show diff stats
Inline Side-by-side
README.md
  Diff comments   View file @a2283bf
... ... @@ -63,6 +63,14 @@ PROJECT STRUCTURE:
63 63  
64 64 CURRENT VERSION
65 65  
  66 +Date: 20/05/2016
  67 +By: Paul Carensac
  68 +Version: 0.4.2
  69 +Ajout de la simulation aux tests du scheduler
  70 +(Attention: DB changed)
  71 +Issue (closed): https://projects.irap.omp.eu/issues/3701
  72 +Major current version (0.4): https://projects.irap.omp.eu/versions/90
  73 +
66 74 Date: 19/05/2016
67 75 By: Paul Carensac
68 76 Version: 0.4.1
... ... @@ -87,6 +95,10 @@ MAIN CHANGES (MILESTONES):
87 95  
88 96 Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
89 97  
  98 +20/05/16 Version 0.4.2 - Final version 0.4
  99 + Complete scheduler update
  100 + https://projects.irap.omp.eu/versions/90
  101 +
90 102 10/05/16 Version 0.3.12 - Final version 0.3
91 103 Complete workflow skeleton
92 104 https://projects.irap.omp.eu/versions/88
... ...
src/scheduler/tests.py
  Diff comments   View file @a2283bf
... ... @@ -2,7 +2,9 @@ from django.test import TestCase
2 2 from scheduler.models import Scheduler
3 3 from pyrosapp.models import *
4 4 from django.contrib.auth.models import User
  5 +from scheduler.simulator import Simulator
5 6  
  7 +SIMULATION_FILE = 'file:./scheduler/sequences_cador.html'
6 8  
7 9 class SchedulerTest(TestCase):
8 10  
... ... @@ -640,3 +642,13 @@ class SchedulerTest(TestCase):
640 642 self.assertEqual(seq2.status, Sequence.INVALID)
641 643 self.assertEqual(seq3.status, Sequence.INVALID)
642 644 self.assertEqual(seq4.status, Sequence.INVALID)
  645 +
  646 + def test_simulation(self):
  647 + '''
  648 + goal : Uses the simulation module to make a schedule and test the validity of created sequences
  649 + '''
  650 +
  651 + print("\n===== TEST_SIMULATION =====\n")
  652 +
  653 + simulator = Simulator()
  654 + simulator.simulate(SIMULATION_FILE)
... ...