From e7d227385690f12d489ab433f3b406bc17429bca Mon Sep 17 00:00:00 2001
From: Noah Levitt <nlevitt@archive.org>
Date: Thu, 16 Aug 2018 11:40:54 -0700
Subject: [PATCH] fix failing tests

---
 brozzler/worker.py  |  4 ++--
 tests/test_units.py | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/brozzler/worker.py b/brozzler/worker.py
index 6994be3..f87388d 100644
--- a/brozzler/worker.py
+++ b/brozzler/worker.py
@@ -322,8 +322,8 @@ class BrozzlerWorker:
 
     def _already_fetched(self, page, ydl_fetches):
         if ydl_fetches:
-            for txn in final_bounces(ydl_fetches, page.url):
-                if (txn['method'] == 'GET' and txn['status_code'] == 200):
+            for fetch in ydl.final_bounces(ydl_fetches, page.url):
+                if (fetch['method'] == 'GET' and fetch['response_code'] == 200):
                     return True
         return False
 
diff --git a/tests/test_units.py b/tests/test_units.py
index 47307d0..a9fdb0e 100644
--- a/tests/test_units.py
+++ b/tests/test_units.py
@@ -23,6 +23,7 @@ import threading
 import os
 import brozzler
 import brozzler.chrome
+import brozzler.ydl
 import logging
 import yaml
 import datetime
@@ -227,9 +228,8 @@ def test_proxy_down():
 
         # youtube-dl fetch
         with tempfile.TemporaryDirectory(prefix='brzl-ydl-') as tempdir:
-            ydl = worker._youtube_dl(tempdir, site)
             with pytest.raises(brozzler.ProxyError):
-                worker._try_youtube_dl(ydl, site, page)
+                brozzler.ydl.do_youtube_dl(worker, site, page)
 
         # raw fetch
         with pytest.raises(brozzler.ProxyError):
@@ -404,18 +404,19 @@ def test_needs_browsing():
     page = brozzler.Page(None, {
         'url':'http://example.com/a'})
 
-    spy = brozzler.worker.YoutubeDLSpy()
-    spy.transactions.append({
+    spy = brozzler.ydl.YoutubeDLSpy()
+    spy.fetches.append({
         'url': 'http://example.com/a',
         'method': 'HEAD',
-        'status_code': 301,
+        'response_code': 301,
         'response_headers': ConvenientHeaders({'Location': '/b'})})
-    spy.transactions.append({
+    spy.fetches.append({
         'url': 'http://example.com/b',
         'method': 'GET',
-        'status_code': 200,
+        'response_code': 200,
         'response_headers': ConvenientHeaders({
             'Content-Type': 'application/pdf'})})
 
-    assert not brozzler.worker.BrozzlerWorker._needs_browsing(None, page, spy)
+    assert not brozzler.worker.BrozzlerWorker._needs_browsing(
+            None, page, spy.fetches)