Merge PR #656 into 17.0

Signed-off-by guewen

queue_job/tests/common.py

@@ -227,12 +227,12 @@ def by_graph(job):
             return job.graph_uuid or ""
 
         sorted_jobs = sorted(self.enqueued_jobs, key=by_graph)
+        self.enqueued_jobs = []
         for graph_uuid, jobs in groupby(sorted_jobs, key=by_graph):
             if graph_uuid:
                 self._perform_graph_jobs(jobs)
             else:
                 self._perform_single_jobs(jobs)
-        self.enqueued_jobs = []
 
     def _perform_single_jobs(self, jobs):
         # we probably don't want to replicate a perfect order here, but at