fix: modify legacy tests so that they can at least be run

even though they fail, useful for when you want to run the whole suite

Author: Mattwmaster58

tests/test_abnormal_crash.py

@@ -8,7 +8,6 @@
 from syncer import sync
 
 from pyppeteer import launch
-from pyppeteer.browser_fetcher import current_platform
 from pyppeteer.errors import NetworkError
 import pytest
 

tests/test_connection.py

@@ -5,18 +5,18 @@
 
 from pyppeteer.errors import NetworkError
 
-from .base import BaseTestCase
+
 import pytest
 
 
-class TestConnection(BaseTestCase):
+class TestConnection:
  @sync
  async def test_error_msg(self):
  with pytest.raises(NetworkError, match='ThisCommand.DoesNotExists') as cm:
  await self.page._client.send('ThisCommand.DoesNotExists')
 
 
-class TestCDPSession(BaseTestCase):
+class TestCDPSession:
  @sync
  async def test_create_session(self):
  client = await self.page.target.createCDPSession()

tests/test_coverage.py

@@ -3,10 +3,10 @@
 
 from syncer import sync
 
-from .base import BaseTestCase
 
 
-class TestJSCoverage(BaseTestCase):
+
+class TestJSCoverage:
  @sync
  async def test_js_coverage(self):
  await self.page.coverage.startJSCoverage()
@@ -131,7 +131,7 @@ async def test_js_coverage_reset_navigation(self):
  assert len(coverage) == 0
 
 
-class TestCSSCoverage(BaseTestCase):
+class TestCSSCoverage:
  @sync
  async def test_css_coverage(self):
  await self.page.coverage.startCSSCoverage()

tests/test_element_handle.py

@@ -9,12 +9,12 @@
 import pyppeteer
 from pyppeteer.errors import ElementHandleError
 
-from .base import BaseTestCase
-from .frame_utils import attachFrame
+
+from .utils import attachFrame
 import pytest
 
 
-class TestBoundingBox(BaseTestCase):
+class TestBoundingBox:
  @sync
  async def test_bounding_box(self):
  await self.page.setViewport({'width': 500, 'height': 500})
@@ -83,7 +83,7 @@ async def test_svg(self):
  assert pptrBoundingBox == webBoundingBox
 
 
-class TestBoxModel(BaseTestCase):
+class TestBoxModel:
  def setUp(self):
  self._old_debug = pyppeteer.DEBUG
  super().setUp()
@@ -173,7 +173,7 @@ async def test_debug_error(self):
  assert await element.boxModel() is None
 
 
-class TestContentFrame(BaseTestCase):
+class TestContentFrame:
  @sync
  async def test_content_frame(self):
  await self.page.goto(self.url + 'empty')
@@ -183,7 +183,7 @@ async def test_content_frame(self):
  assert frame == self.page.frames[1]
 
 
-class TestClick(BaseTestCase):
+class TestClick:
  @sync
  async def test_clik(self):
  await self.page.goto(self.url + 'assets/button.html')
@@ -242,7 +242,7 @@ async def test_br_node(self):
  assert 'Node is either not visible or not an HTMLElement' == cm.exception.args[0]
 
 
-class TestHover(BaseTestCase):
+class TestHover:
  @sync
  async def test_hover(self):
  await self.page.goto(self.url + 'assets/scrollable.html')
@@ -251,7 +251,7 @@ async def test_hover(self):
  assert await self.page.evaluate('document.querySelector("button:hover").id') == 'button-6'
 
 
-class TestIsIntersectingViewport(BaseTestCase):
+class TestIsIntersectingViewport:
  @sync
  async def test_is_intersecting_viewport(self):
  await self.page.goto(self.url + 'assets/offscreenbuttons.html')
@@ -261,7 +261,7 @@ async def test_is_intersecting_viewport(self):
  assert await button.isIntersectingViewport() == visible
 
 
-class TestScreenshot(BaseTestCase):
+class TestScreenshot:
  @sync
  async def test_screenshot_larger_than_viewport(self):
  await self.page.setViewport({'width': 500, 'height': 500})
@@ -290,7 +290,7 @@ async def test_screenshot_larger_than_viewport(self):
  assert {'w': 500, 'h': 500} == size
 
 
-class TestQuerySelector(BaseTestCase):
+class TestQuerySelector:
  @sync
  async def test_J(self):
  await self.page.setContent(

tests/test_execution_context.py

@@ -5,11 +5,11 @@
 
 from pyppeteer.errors import ElementHandleError, NetworkError
 
-from .base import BaseTestCase
+
 import pytest
 
 
-class TestQueryObject(BaseTestCase):
+class TestQueryObject:
  @sync
  async def test_query_objects(self):
  await self.page.goto(self.url + 'empty')
@@ -37,7 +37,7 @@ async def test_query_objects_primitive_value_error(self):
  await self.page.queryObjects(prototypeHandle)
 
 
-class TestJSHandle(BaseTestCase):
+class TestJSHandle:
  @sync
  async def test_get_property(self):
  handle1 = await self.page.evaluateHandle('() => ({one: 1, two: 2, three: 3})')

tests/test_input.py

@@ -10,12 +10,12 @@
 
 from pyppeteer.errors import PageError, PyppeteerError
 
-from .base import BaseTestCase
-from .frame_utils import attachFrame
+
+from .utils import attachFrame
 import pytest
 
 
-class TestClick(BaseTestCase):
+class TestClick:
  get_dimensions = '''
  function () {
  const rect = document.querySelector('textarea').getBoundingClientRect();
@@ -320,7 +320,7 @@ async def test_click_with_device_scale_factor(self):
  assert await frame.evaluate('result') == 'Clicked'
 
 
-class TestFileUpload(BaseTestCase):
+class TestFileUpload:
  @unittest.skipIf(
  sys.platform.startswith('cyg') or sys.platform.startswith('msys'), 'Hangs on cygwin/msys',
  )
@@ -345,7 +345,7 @@ async def test_file_upload(self):
  )
 
 
-class TestType(BaseTestCase):
+class TestType:
  @sync
  async def test_key_type(self):
  await self.page.goto(self.url + 'assets/textarea.html')

tests/test_launcher.py

@@ -17,26 +17,24 @@
 from syncer import sync
 import websockets
 
-from pyppeteer import connect, launch, executablePath, defaultArgs
-from pyppeteer.browser_fetcher import chromium_executable, current_platform
 from pyppeteer.errors import NetworkError
 from pyppeteer.launcher import launcher
 from pyppeteer.util import get_free_port
 
-from .base import DEFAULT_OPTIONS
+
 from .utils.server import get_application
 import pytest
 
 
 class TestLauncher(unittest.TestCase):
- def setUp(self):
- self.headless_options = [
- '--headless',
- '--hide-scrollbars',
- '--mute-audio',
- ]
- if current_platform().startswith('win'):
- self.headless_options.append('--disable-gpu')
+ # def setUp(self):
+ #  self.headless_options = [
+ #  '--headless',
+ #  '--hide-scrollbars',
+ #  '--mute-audio',
+ #  ]
+ #  if current_platform().startswith('win'):
+ #  self.headless_options.append('--disable-gpu')
 
  def check_default_args(self, launcher):
  for opt in self.headless_options:
@@ -253,7 +251,7 @@ async def test_level_default(self):
  assert not self.logger.isEnabledFor(logging.DEBUG)
  self.mock.assert_not_called()
 
- @unittest.skipIf(current_platform().startswith('win'), 'error on windows')
+ # @unittest.skipIf(current_platform().startswith('win'), 'error on windows')
  @sync
  async def test_level_info(self):
  browser = await launch(args=['--no-sandbox'], logLevel=logging.INFO)
@@ -265,7 +263,7 @@ async def test_level_info(self):
 
  assert 'listening on' in self.mock.call_args_list[0][0][0]
 
- @unittest.skipIf(current_platform().startswith('win'), 'error on windows')
+ # @unittest.skipIf(current_platform().startswith('win'), 'error on windows')
  @sync
  async def test_level_debug(self):
  browser = await launch(args=['--no-sandbox'], logLevel=logging.DEBUG)
@@ -284,7 +282,7 @@ async def test_level_debug(self):
  assert 'SEND' in self.mock.call_args_list[1][0][0]
  assert 'RECV' in self.mock.call_args_list[2][0][0]
 
- @unittest.skipIf(current_platform().startswith('win'), 'error on windows')
+ # @unittest.skipIf(current_platform().startswith('win'), 'error on windows')
  @sync
  async def test_connect_debug(self):
  browser = await launch(args=['--no-sandbox'])

tests/test_network.py

@@ -10,11 +10,11 @@
 
 from pyppeteer.errors import NetworkError, PageError
 
-from .base import BaseTestCase
+
 import pytest
 
 
-class TestNetworkEvent(BaseTestCase):
+class TestNetworkEvent:
  @sync
  async def test_request(self):
  requests = []
@@ -35,7 +35,7 @@ async def test_request_post(self):
 
  from tornado.web import RequestHandler
 
- class PostHandler(RequestHandler):
+ class PostHandler:
  def post(self):
  self.write('')
 
@@ -150,7 +150,7 @@ async def test_not_report_body_unless_finished(self):
 
  from tornado.web import RequestHandler
 
- class GetHandler(RequestHandler):
+ class GetHandler:
  def get(self):
  serverResponses.append(self)
  self.write('hello ')
@@ -240,7 +240,7 @@ async def test_redirects(self):
  assert 'redirect1' in redirectChain[0].url
 
 
-class TestRequestInterception(BaseTestCase):
+class TestRequestInterception:
  @sync
  async def test_request_interception(self):
  await self.page.setRequestInterception(True)
@@ -550,7 +550,7 @@ async def test_request_respond_bytes(self):
  pass
 
 
-class TestNavigationRequest(BaseTestCase):
+class TestNavigationRequest:
  @sync
  async def test_navigation_request(self):
  requests = {}

tests/test_pyppeteer.py

@@ -14,10 +14,10 @@
 
 from syncer import sync
 
-from .base import BaseTestCase
 
 
-class TestPyppeteer(BaseTestCase):
+
+class TestPyppeteer:
  @sync
  async def test_get_https(self):
  await self.page.goto('https://example.com/')
@@ -53,7 +53,7 @@ async def test_inject_file(self): # deprecated
  tmp_file.unlink()
 
 
-class TestScreenshot(BaseTestCase):
+class TestScreenshot:
  def setUp(self):
  super().setUp()
  self.target_path = Path(__file__).resolve().parent / 'test.png'

tests/test_screenshot.py

@@ -14,7 +14,7 @@
 blank_pdf_path = root_path / 'blank.pdf'
 
 
-class TestScreenShot(TestCase):
+class TestScreenShot:
  def setUp(self):
  self.browser = sync(launch(args=['--no-sandbox']))
  self.target_path = Path(__file__).resolve().parent / 'test.png'
@@ -79,7 +79,7 @@ async def test_unresolved_mimetype(self):
  await page.screenshot(options)
 
 
-class TestPDF(TestCase):
+class TestPDF:
  def setUp(self):
  self.browser = sync(launch(args=['--no-sandbox']))
  self.target_path = Path(__file__).resolve().parent / 'test.pdf'