Merge branch 'master' into qa

* master:
  turns out we want populate_defaults to happen in __init__, fix so things work right

setup.py

@@ -32,7 +32,7 @@ def find_package_data(package):
 
 setuptools.setup(
         name='brozzler',
-        version='1.1b9.dev200',
+        version='1.1b9.dev201',
         description='Distributed web crawling with browsers',
         url='https://github.com/internetarchive/brozzler',
         author='Noah Levitt',
@@ -69,7 +69,7 @@ setuptools.setup(
             'websocket-client!=0.39.0',
             'pillow==3.3.0',
             'surt>=0.3.0',
-            'doublethink>=0.2.0.dev70',
+            'doublethink>=0.2.0.dev71',
             'rethinkdb>=2.3,<2.4',
             'cerberus==1.0.1',
             'jinja2',

tests/test_frontier.py

@@ -180,8 +180,8 @@ def test_field_defaults():
     brozzler.Page.table_ensure(rr)
     page = brozzler.Page(rr, {'hops_from_seed': 3})
     assert page.hops_from_seed == 3
-    assert page.id is None
-    assert page.brozzle_count is None
+    assert page.id
+    assert page.brozzle_count == 0
     page.save()
     assert page.hops_from_seed == 3
     assert page.id
@@ -205,7 +205,7 @@ def test_field_defaults():
     site = brozzler.Site(rr, {'enable_warcprox_features': True})
     assert site.enable_warcprox_features is True
     assert site.id is None
-    assert site.scope is None
+    assert site.scope
     site.save()
     assert site.id
     assert site.scope
@@ -228,7 +228,7 @@ def test_field_defaults():
     job = brozzler.Job(rr, {'status': 'WHUUUT'})
     assert job.status == 'WHUUUT'
     assert job.id is None
-    assert job.starts_and_stops is None
+    assert job.starts_and_stops
     job.save()
     assert job.status == 'WHUUUT'
     assert job.id