Commit 57f128b5 authored by Jérome Perrin's avatar Jérome Perrin

software/kvm/test: python3 compatibility

parent 0c942fce
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# #
############################################################################## ##############################################################################
import httplib import six.moves.http_client as httplib
import json import json
import os import os
import re import re
...@@ -33,7 +33,7 @@ import requests ...@@ -33,7 +33,7 @@ import requests
import slapos.util import slapos.util
import subprocess import subprocess
import sqlite3 import sqlite3
import urlparse import six.moves.urllib.parse as urlparse
import unittest import unittest
from slapos.recipe.librecipe import generateHashFromFiles from slapos.recipe.librecipe import generateHashFromFiles
...@@ -42,7 +42,7 @@ from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass ...@@ -42,7 +42,7 @@ from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
def sanityCheck(): def sanityCheck():
try: try:
output = subprocess.check_output("lsmod | grep kvm_intel", shell=True) output = subprocess.check_output("lsmod | grep kvm_intel", shell=True, universal_newlines=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
state = False state = False
output = e.output output = e.output
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment