VFS-1172, merge with develop

Author: lopiola

docker/ct_run.py

@@ -172,9 +172,6 @@
                 config['sys.config']['covered_dirs'] = docker_dirs
                 config['sys.config']['covered_excluded_modules'] = excl_mods
 
-            print(json.dumps(data))
-            print('')
-            print('')
             with open(file, 'w') as jsonFile:
                 jsonFile.write(json.dumps(data))
 
@@ -211,21 +208,21 @@
     cmd=ct_command,
     shed_privileges=(platform.system() == 'Linux'))
 
-# ret = docker.run(tty=True,
-#                  rm=True,
-#                  interactive=True,
-#                  workdir=os.path.join(script_dir, 'test_distributed'),
-#                  reflect=[(script_dir, 'rw'),
-#                           ('/var/run/docker.sock', 'rw')],
-#                  name='testmaster_{0}'.format(uid),
-#                  hostname='testmaster.{0}.dev.docker'.format(uid),
-#                  image=args.image,
-#                  command=['python', '-c', command])
-#
-# os.remove(new_cover)
+ret = docker.run(tty=True,
+                 rm=True,
+                 interactive=True,
+                 workdir=os.path.join(script_dir, 'test_distributed'),
+                 reflect=[(script_dir, 'rw'),
+                          ('/var/run/docker.sock', 'rw')],
+                 name='testmaster_{0}'.format(uid),
+                 hostname='testmaster.{0}.dev.docker'.format(uid),
+                 image=args.image,
+                 command=['python', '-c', command])
+
+os.remove(new_cover)
 if args.cover:
     for file in env_descs:
         os.remove(file)
         shutil.move(file + '.bak', file)
-#
-# sys.exit(ret)
+
+sys.exit(ret)