Commit 73f613d7 authored by Jérome Perrin's avatar Jérome Perrin

software/turnserver: port to python3

parent 3e221326
...@@ -33,3 +33,4 @@ extra = ...@@ -33,3 +33,4 @@ extra =
restic-rest-server ${slapos.test.restic_rest_server-setup:setup} restic-rest-server ${slapos.test.restic_rest_server-setup:setup}
seleniumserver ${slapos.test.seleniumserver-setup:setup} seleniumserver ${slapos.test.seleniumserver-setup:setup}
theia ${slapos.test.theia-setup:setup} theia ${slapos.test.theia-setup:setup}
turnserver ${slapos.test.turnserver-setup:setup}
...@@ -381,7 +381,6 @@ extra = ...@@ -381,7 +381,6 @@ extra =
re6stnet ${slapos.test.re6stnet-setup:setup} re6stnet ${slapos.test.re6stnet-setup:setup}
slapos-master ${slapos.test.slapos-master-setup:setup} slapos-master ${slapos.test.slapos-master-setup:setup}
slaprunner ${slapos.test.slaprunner-setup:setup} slaprunner ${slapos.test.slaprunner-setup:setup}
turnserver ${slapos.test.turnserver-setup:setup}
upgrade_erp5 ${slapos.test.upgrade_erp5-setup:setup} upgrade_erp5 ${slapos.test.upgrade_erp5-setup:setup}
[versions] [versions]
......
...@@ -14,9 +14,6 @@ parts = ...@@ -14,9 +14,6 @@ parts =
coturn coturn
instance-cfg instance-cfg
[python]
part = python2.7
[download-base] [download-base]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
...@@ -29,7 +29,7 @@ import os ...@@ -29,7 +29,7 @@ import os
import subprocess import subprocess
import json import json
import glob import glob
import ConfigParser import configparser
from slapos.recipe.librecipe import generateHashFromFiles from slapos.recipe.librecipe import generateHashFromFiles
from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
...@@ -96,7 +96,7 @@ class TestServices(TurnServerTestCase): ...@@ -96,7 +96,7 @@ class TestServices(TurnServerTestCase):
secret_file = os.path.join(self.partition_path, 'etc/.turnsecret') secret_file = os.path.join(self.partition_path, 'etc/.turnsecret')
self.assertTrue(os.path.exists(self.partition_path)) self.assertTrue(os.path.exists(self.partition_path))
self.assertTrue(os.path.exists(secret_file)) self.assertTrue(os.path.exists(secret_file))
config = ConfigParser.ConfigParser() config = configparser.ConfigParser()
with open(secret_file) as f: with open(secret_file) as f:
config.readfp(f) config.readfp(f)
secret = config.get('turnserver', 'secret') secret = config.get('turnserver', 'secret')
...@@ -151,7 +151,7 @@ class TestParameters(TurnServerTestCase): ...@@ -151,7 +151,7 @@ class TestParameters(TurnServerTestCase):
secret_file = os.path.join(self.partition_path, 'etc/.turnsecret') secret_file = os.path.join(self.partition_path, 'etc/.turnsecret')
self.assertTrue(os.path.exists(self.partition_path)) self.assertTrue(os.path.exists(self.partition_path))
self.assertTrue(os.path.exists(secret_file)) self.assertTrue(os.path.exists(secret_file))
config = ConfigParser.ConfigParser() config = configparser.ConfigParser()
with open(secret_file) as f: with open(secret_file) as f:
config.readfp(f) config.readfp(f)
secret = config.get('turnserver', 'secret') secret = config.get('turnserver', 'secret')
......
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