Skip to content

Commit 10aab15

Browse files
committed
make all unit tests get URL from .env file
1 parent 808d6cd commit 10aab15

5 files changed

Lines changed: 49 additions & 25 deletions

File tree

tests/test_admin.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import unittest
22
import logging
33
import asyncio
4+
import os
5+
from urllib.parse import urljoin
46

57
from janus_client import JanusAdminMonitorClient
68
from tests.util import async_test
@@ -357,11 +359,14 @@ async def test_disallow_token(self):
357359
await self.asyncTearDown()
358360

359361

360-
class TestTransportHttps(BaseTestClass.TestClass):
361-
server_url = "https://janusmy.josephgetmyip.com/janusadminbase/admin"
362-
admin_secret = "janusoverlord"
362+
class TestTransportHttp(BaseTestClass.TestClass):
363+
server_url = urljoin(
364+
os.getenv("JANUS_HTTP_ADMIN_URL", ""),
365+
os.getenv("JANUS_HTTP_ADMIN_PATH", ""),
366+
)
367+
admin_secret = os.getenv("JANUS_ADMIN_SECRET", "")
363368

364369

365-
class TestTransportWebsocketSecure(BaseTestClass.TestClass):
366-
server_url = "wss://janusmy.josephgetmyip.com/janusadminbasews/admin"
367-
admin_secret = "janusoverlord"
370+
class TestTransportWebsocket(BaseTestClass.TestClass):
371+
server_url = os.getenv("JANUS_WS_ADMIN_URL", "")
372+
admin_secret = os.getenv("JANUS_ADMIN_SECRET", "")

tests/test_multi_session_plugin.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import unittest
22
import logging
33
import asyncio
4+
import os
5+
from urllib.parse import urljoin
46

57
from janus_client import JanusTransport, JanusSession, JanusVideoRoomPlugin
68
from tests.util import async_test
@@ -9,7 +11,7 @@
911
logging.basicConfig(format=format, level=logging.INFO, datefmt="%H:%M:%S")
1012
logger = logging.getLogger()
1113

12-
ut_api_secret = "janusrocks"
14+
ut_api_secret = os.getenv("JANUS_API_SECRET", "")
1315

1416

1517
class BaseTestClass:
@@ -370,9 +372,12 @@ async def test_N_plugin(session, publisher_id):
370372
await self.asyncTearDown()
371373

372374

373-
class TestTransportHttps(BaseTestClass.TestClass):
374-
server_url = "https://janusmy.josephgetmyip.com/janusbase/janus"
375+
class TestTransportHttp(BaseTestClass.TestClass):
376+
server_url = urljoin(
377+
os.getenv("JANUS_HTTP_URL", ""),
378+
os.getenv("JANUS_HTTP_BASE_PATH", ""),
379+
)
375380

376381

377-
class TestTransportWebsocketSecure(BaseTestClass.TestClass):
378-
server_url = "wss://janusmy.josephgetmyip.com/janusbasews/janus"
382+
class TestTransportWebsocket(BaseTestClass.TestClass):
383+
server_url = os.getenv("JANUS_WS_URL", "")

tests/test_plugin.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import logging
33
import asyncio
44
import os
5+
from urllib.parse import urljoin
56

67
from janus_client import (
78
JanusTransport,
@@ -22,7 +23,7 @@ class TestClass(unittest.TestCase):
2223

2324
async def asyncSetUp(self) -> None:
2425
self.transport = JanusTransport.create_transport(
25-
base_url=self.server_url, api_secret="janusrocks"
26+
base_url=self.server_url, api_secret=os.getenv("JANUS_API_SECRET", "")
2627
)
2728
await self.transport.connect()
2829

@@ -53,6 +54,8 @@ async def test_plugin_create_fail(self):
5354
@async_test
5455
async def test_plugin_echotest_create(self):
5556
await self.asyncSetUp()
57+
logger.info("Start")
58+
print("ewq")
5659

5760
session = JanusSession(transport=self.transport)
5861

@@ -92,9 +95,12 @@ async def test_plugin_echotest_create(self):
9295
await self.asyncTearDown()
9396

9497

95-
class TestTransportHttps(BaseTestClass.TestClass):
96-
server_url = "https://janusmy.josephgetmyip.com/janusbase/janus"
98+
class TestTransportHttp(BaseTestClass.TestClass):
99+
server_url = urljoin(
100+
os.getenv("JANUS_HTTP_URL", ""),
101+
os.getenv("JANUS_HTTP_BASE_PATH", ""),
102+
)
97103

98104

99-
class TestTransportWebsocketSecure(BaseTestClass.TestClass):
100-
server_url = "wss://janusmy.josephgetmyip.com/janusbasews/janus"
105+
class TestTransportWebsocket(BaseTestClass.TestClass):
106+
server_url = os.getenv("JANUS_WS_URL", "")

tests/test_plugin_video_call.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import logging
33
import asyncio
44
import os
5+
from urllib.parse import urljoin
56

67
from aiortc.contrib.media import MediaPlayer, MediaRecorder
78

@@ -23,7 +24,7 @@ class TestClass(unittest.TestCase):
2324

2425
async def asyncSetUp(self) -> None:
2526
self.transport = JanusTransport.create_transport(
26-
base_url=self.server_url, api_secret="janusrocks"
27+
base_url=self.server_url, api_secret=os.getenv("JANUS_API_SECRET", "")
2728
)
2829
await self.transport.connect()
2930

@@ -210,9 +211,12 @@ async def on_incoming_call(plugin: JanusVideoCallPlugin, jsep: dict):
210211
await self.asyncTearDown()
211212

212213

213-
class TestTransportHttps(BaseTestClass.TestClass):
214-
server_url = "https://janusmy.josephgetmyip.com/janusbase/janus"
214+
class TestTransportHttp(BaseTestClass.TestClass):
215+
server_url = urljoin(
216+
os.getenv("JANUS_HTTP_URL", ""),
217+
os.getenv("JANUS_HTTP_BASE_PATH", ""),
218+
)
215219

216220

217-
class TestTransportWebsocketSecure(BaseTestClass.TestClass):
218-
server_url = "wss://janusmy.josephgetmyip.com/janusbasews/janus"
221+
class TestTransportWebsocket(BaseTestClass.TestClass):
222+
server_url = os.getenv("JANUS_WS_URL", "")

tests/test_plugin_video_room.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import logging
33
import asyncio
44
import os
5+
from urllib.parse import urljoin
56

67
from aiortc.contrib.media import MediaRecorder
78

@@ -401,9 +402,12 @@ async def on_track_created(track):
401402
await self.asyncTearDown()
402403

403404

404-
class TestTransportHttps(BaseTestClass.TestClass):
405-
server_url = "https://janusmy.josephgetmyip.com/janusbase/janus"
405+
class TestTransportHttp(BaseTestClass.TestClass):
406+
server_url = urljoin(
407+
os.getenv("JANUS_HTTP_URL", ""),
408+
os.getenv("JANUS_HTTP_BASE_PATH", ""),
409+
)
406410

407411

408-
class TestTransportWebsocketSecure(BaseTestClass.TestClass):
409-
server_url = "wss://janusmy.josephgetmyip.com/janusbasews/janus"
412+
class TestTransportWebsocket(BaseTestClass.TestClass):
413+
server_url = os.getenv("JANUS_WS_URL", "")

0 commit comments

Comments
 (0)