BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356234 )
Change subject: flake8 fixes for E305
......................................................................
flake8 fixes for E305
Fix "E305 expected 2 blank lines after class or function definition"
warnings in preparation for flake8 upgrade in tox tests.
Change-Id: I75425fc791f8745e02f5663aa0c73a6f057ecf2e
---
M modules/admin/data/data_admin.py
M modules/admin/data/data_test.py
M modules/apt/files/apt2xml.py
M modules/authdns/files/authdns-gen-zones.py
M modules/base/files/firewall/check_conntrack.py
M modules/base/files/labs/notify_maintainers.py
M modules/base/files/monitoring/check-fresh-files-in-dir.py
M modules/beta/files/wmf-beta-update-databases.py
M modules/confd/files/confd-lint-wrap.py
M modules/drac/files/drac.py
M modules/dynamicproxy/files/invisible-unicorn.py
M modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
M modules/elasticsearch/files/nagios/check_elasticsearch_test.py
M modules/etcd/files/etcd-backup.py
M modules/ganglia/files/plugins/diskstat.py
M modules/ganglia/files/plugins/nginx_status.py
M modules/ganglia/files/plugins/udp2log_socket.py
M modules/hhvm/files/debug/printers.py
M modules/hhvm/files/monitoring/hhvm_tc_space.py
M modules/icinga/files/check_legal_html.py
M modules/icinga/files/check_ripe_atlas.py
M modules/icinga/files/purge-nagios-resources.py
M modules/labstore/files/block_sync.py
M modules/librenms/files/purge.py
M modules/mediawiki/files/apache/sites/redirects/test_redirects_dat.py
M modules/memcached/files/ganglia/gmond_memcached.py
M modules/mw_rc_irc/files/udpmxircecho.py
M modules/nodepool/files/check_nodepool_states.py
M modules/openstack/files/check_keystone_projects.py
M modules/openstack/files/kilo/virtscripts/logstat.py
M modules/openstack/files/liberty/horizon/overrides.py
M modules/openstack/files/liberty/virtscripts/logstat.py
M modules/openstack/files/mitaka/horizon/overrides.py
M modules/openstack/files/mitaka/virtscripts/logstat.py
M modules/openstack/files/monitor_labs_salt_keys.py
M modules/osm/files/ganglia/osm.py
M modules/phabricator/files/phab_epipe.py
M modules/postgresql/files/ganglia/postgresql.py
M modules/pybal/files/pybal-eval-check.py
M modules/redis/files/ganglia/redis_monitoring.py
M modules/role/files/labs/db/views/maintain-meta_p.py
M modules/role/files/labs/puppet-enc.py
M modules/tlsproxy/files/utils/cipher_sim.py
M modules/toollabs/files/gridscripts/runninggridtasks.py
M modules/toollabs/files/kube2proxy.py
M modules/toollabs/files/proxylistener.py
M modules/varnish/files/varnishlog.py
M modules/varnish/files/zerofetch.py
M modules/wdqs/files/monitor/blazegraph.py
M modules/zuul/files/zuul-test-repo.py
M utils/new_wmf_service.py
A utils/vagrant/private
52 files changed, 62 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/356234/1
diff --git a/modules/admin/data/data_admin.py b/modules/admin/data/data_admin.py
index 551e092..993f011 100644
--- a/modules/admin/data/data_admin.py
+++ b/modules/admin/data/data_admin.py
@@ -22,5 +22,6 @@
print yaml.dump({'groups': dict_sort(admins['groups'])})
print yaml.dump({'users': dict_sort(admins['users'])})
+
if __name__ == '__main__':
main()
diff --git a/modules/admin/data/data_test.py b/modules/admin/data/data_test.py
index d5476ca..e343973 100644
--- a/modules/admin/data/data_test.py
+++ b/modules/admin/data/data_test.py
@@ -21,5 +21,6 @@
dupes = [k for k, v in Counter(gids).items() if v > 1]
self.assertEqual([], dupes, 'Duplicate group GIDs: %r' % dupes)
+
if __name__ == '__main__':
unittest.main()
diff --git a/modules/apt/files/apt2xml.py b/modules/apt/files/apt2xml.py
index d746296..6cce25d 100644
--- a/modules/apt/files/apt2xml.py
+++ b/modules/apt/files/apt2xml.py
@@ -74,5 +74,6 @@
return doc.toxml().replace('\n', '')
+
if __name__ == '__main__':
print getUpdates()
diff --git a/modules/authdns/files/authdns-gen-zones.py
b/modules/authdns/files/authdns-gen-zones.py
index 1726532..f3b06f5 100644
--- a/modules/authdns/files/authdns-gen-zones.py
+++ b/modules/authdns/files/authdns-gen-zones.py
@@ -114,6 +114,7 @@
if errors:
sys.exit(1)
+
if __name__ == '__main__':
main()
diff --git a/modules/base/files/firewall/check_conntrack.py
b/modules/base/files/firewall/check_conntrack.py
index 3a7b895..d38463e 100644
--- a/modules/base/files/firewall/check_conntrack.py
+++ b/modules/base/files/firewall/check_conntrack.py
@@ -49,5 +49,6 @@
print("UNKNOWN: error reading nf_conntrack")
sys.exit(3)
+
if __name__ == '__main__':
main()
diff --git a/modules/base/files/labs/notify_maintainers.py
b/modules/base/files/labs/notify_maintainers.py
index 5450961..a404bc1 100644
--- a/modules/base/files/labs/notify_maintainers.py
+++ b/modules/base/files/labs/notify_maintainers.py
@@ -90,5 +90,6 @@
email_admins(args.s, args.m)
+
if __name__ == '__main__':
main()
diff --git a/modules/base/files/monitoring/check-fresh-files-in-dir.py
b/modules/base/files/monitoring/check-fresh-files-in-dir.py
index 19630d8..4c6d732 100644
--- a/modules/base/files/monitoring/check-fresh-files-in-dir.py
+++ b/modules/base/files/monitoring/check-fresh-files-in-dir.py
@@ -81,6 +81,7 @@
print "OK\n"
return 0
+
if __name__ == '__main__':
sys.exit(main())
diff --git a/modules/beta/files/wmf-beta-update-databases.py
b/modules/beta/files/wmf-beta-update-databases.py
index f7ce81b..a222df7 100755
--- a/modules/beta/files/wmf-beta-update-databases.py
+++ b/modules/beta/files/wmf-beta-update-databases.py
@@ -96,5 +96,6 @@
dblist = check_dblist(args.dblist)
run_updates(dblist, args.batch)
+
if __name__ == '__main__':
sys.exit(main())
diff --git a/modules/confd/files/confd-lint-wrap.py
b/modules/confd/files/confd-lint-wrap.py
index f40d9c5..413c3fe 100644
--- a/modules/confd/files/confd-lint-wrap.py
+++ b/modules/confd/files/confd-lint-wrap.py
@@ -69,5 +69,6 @@
print msg
sys.exit(0)
+
if __name__ == "__main__":
main()
diff --git a/modules/drac/files/drac.py b/modules/drac/files/drac.py
index 29acdcd..2bc4074 100644
--- a/modules/drac/files/drac.py
+++ b/modules/drac/files/drac.py
@@ -101,5 +101,6 @@
print "Couldn't connect to %s" % (server)
return
+
if __name__ == "__main__":
main()
diff --git a/modules/dynamicproxy/files/invisible-unicorn.py
b/modules/dynamicproxy/files/invisible-unicorn.py
index c580c0b..7983caa 100644
--- a/modules/dynamicproxy/files/invisible-unicorn.py
+++ b/modules/dynamicproxy/files/invisible-unicorn.py
@@ -250,6 +250,8 @@
for route in project.routes:
print("Refreshing route: %s " % route)
redis_store.refresh_route(route)
+
+
update_redis_from_db()
diff --git a/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
b/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
index dceab28..88bf6ac 100644
--- a/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
+++ b/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
@@ -28,6 +28,7 @@
d.update(stat)
return d
+
# Maximum time to server stale stats
LAST_FETCH_THRESHOLD = 600
diff --git a/modules/elasticsearch/files/nagios/check_elasticsearch_test.py
b/modules/elasticsearch/files/nagios/check_elasticsearch_test.py
index 6373d7c..6dffedb 100644
--- a/modules/elasticsearch/files/nagios/check_elasticsearch_test.py
+++ b/modules/elasticsearch/files/nagios/check_elasticsearch_test.py
@@ -25,5 +25,6 @@
def _breach(self, threshold, *args):
return Threshold(threshold).breach(*args)
+
if __name__ == '__main__':
unittest.main()
diff --git a/modules/etcd/files/etcd-backup.py
b/modules/etcd/files/etcd-backup.py
index e6f1da1..e936253 100755
--- a/modules/etcd/files/etcd-backup.py
+++ b/modules/etcd/files/etcd-backup.py
@@ -96,5 +96,6 @@
rotate_logs(args.cluster_name, args.backup_dir, args.keep)
etcd_backup(args.cluster_name, args.backup_dir)
+
if __name__ == '__main__':
main()
diff --git a/modules/ganglia/files/plugins/diskstat.py
b/modules/ganglia/files/plugins/diskstat.py
index d4a5efb..a2f829b 100644
--- a/modules/ganglia/files/plugins/diskstat.py
+++ b/modules/ganglia/files/plugins/diskstat.py
@@ -526,6 +526,7 @@
logging.shutdown()
# pass
+
if __name__ == '__main__':
from optparse import OptionParser
diff --git a/modules/ganglia/files/plugins/nginx_status.py
b/modules/ganglia/files/plugins/nginx_status.py
index 8f0b1bf..2c7adbb 100644
--- a/modules/ganglia/files/plugins/nginx_status.py
+++ b/modules/ganglia/files/plugins/nginx_status.py
@@ -266,6 +266,7 @@
logging.shutdown()
# pass
+
if __name__ == '__main__':
from optparse import OptionParser
diff --git a/modules/ganglia/files/plugins/udp2log_socket.py
b/modules/ganglia/files/plugins/udp2log_socket.py
index 7da7011..0c50b66 100644
--- a/modules/ganglia/files/plugins/udp2log_socket.py
+++ b/modules/ganglia/files/plugins/udp2log_socket.py
@@ -109,6 +109,7 @@
aggr['drops'] += status['drops']
return aggr
+
#
# Gmond Interface
#
diff --git a/modules/hhvm/files/debug/printers.py
b/modules/hhvm/files/debug/printers.py
index c1723d1..f48f301 100644
--- a/modules/hhvm/files/debug/printers.py
+++ b/modules/hhvm/files/debug/printers.py
@@ -921,6 +921,7 @@
# Cannot find a pretty printer. Return None.
return None
+
libstdcxx_printer = None
@@ -1157,4 +1158,5 @@
libstdcxx_printer.add('std::__norm::_Deque_iterator',
StdDequeIteratorPrinter)
+
build_libstdcxx_dictionary()
diff --git a/modules/hhvm/files/monitoring/hhvm_tc_space.py
b/modules/hhvm/files/monitoring/hhvm_tc_space.py
index 856d5a7..7bc0d90 100755
--- a/modules/hhvm/files/monitoring/hhvm_tc_space.py
+++ b/modules/hhvm/files/monitoring/hhvm_tc_space.py
@@ -53,5 +53,6 @@
except Exception as e:
nagios_exit('UNKNOWN', "Unhandled error: {}".format(e))
+
if __name__ == '__main__':
main()
diff --git a/modules/icinga/files/check_legal_html.py
b/modules/icinga/files/check_legal_html.py
index 317713d..0f5c569 100644
--- a/modules/icinga/files/check_legal_html.py
+++ b/modules/icinga/files/check_legal_html.py
@@ -114,5 +114,6 @@
print "all html is present."
+
if __name__ == '__main__':
main()
diff --git a/modules/icinga/files/check_ripe_atlas.py
b/modules/icinga/files/check_ripe_atlas.py
index 63c34b9..f53d358 100644
--- a/modules/icinga/files/check_ripe_atlas.py
+++ b/modules/icinga/files/check_ripe_atlas.py
@@ -62,6 +62,7 @@
allowed_failures,
UDM_id)
+
if __name__ == "__main__":
try:
main()
diff --git a/modules/icinga/files/purge-nagios-resources.py
b/modules/icinga/files/purge-nagios-resources.py
index 07f7138..d791edd 100755
--- a/modules/icinga/files/purge-nagios-resources.py
+++ b/modules/icinga/files/purge-nagios-resources.py
@@ -52,6 +52,7 @@
else:
newFile.write(line)
+
if __name__ == '__main__':
if len(sys.argv) < 3:
print("\n\tUsage:\n\t\t%s <hosts.cfg> <resources1.cfg> "
diff --git a/modules/labstore/files/block_sync.py
b/modules/labstore/files/block_sync.py
index 9881a3c..1afab33 100644
--- a/modules/labstore/files/block_sync.py
+++ b/modules/labstore/files/block_sync.py
@@ -58,6 +58,7 @@
patch = subprocess.Popen(shlex.split(patch_cmd), stdin=progress.stdout)
patch.communicate()[0]
+
if __name__ == '__main__':
if os.geteuid() != 0:
diff --git a/modules/librenms/files/purge.py b/modules/librenms/files/purge.py
index 346e165..49a26d5 100644
--- a/modules/librenms/files/purge.py
+++ b/modules/librenms/files/purge.py
@@ -96,6 +96,7 @@
sys.exit(2)
return proc.communicate()[0]
+
try:
with open(config_file) as f:
pass
diff --git
a/modules/mediawiki/files/apache/sites/redirects/test_redirects_dat.py
b/modules/mediawiki/files/apache/sites/redirects/test_redirects_dat.py
index 70653b2..8dbbc51 100644
--- a/modules/mediawiki/files/apache/sites/redirects/test_redirects_dat.py
+++ b/modules/mediawiki/files/apache/sites/redirects/test_redirects_dat.py
@@ -34,5 +34,6 @@
'redirects.conf not regenerated. Run ./refreshDomainRedirects.'
)
+
if __name__ == '__main__':
unittest.main()
diff --git a/modules/memcached/files/ganglia/gmond_memcached.py
b/modules/memcached/files/ganglia/gmond_memcached.py
index 36efbe0..c85110d 100644
--- a/modules/memcached/files/ganglia/gmond_memcached.py
+++ b/modules/memcached/files/ganglia/gmond_memcached.py
@@ -346,6 +346,7 @@
def metric_cleanup():
_Worker_Thread.shutdown()
+
if __name__ == '__main__':
try:
params = {
diff --git a/modules/mw_rc_irc/files/udpmxircecho.py
b/modules/mw_rc_irc/files/udpmxircecho.py
index f48b3ba..1091a52 100755
--- a/modules/mw_rc_irc/files/udpmxircecho.py
+++ b/modules/mw_rc_irc/files/udpmxircecho.py
@@ -85,4 +85,6 @@
sthr = EchoReader(bot)
sthr.start()
bot.start()
+
+
main()
diff --git a/modules/nodepool/files/check_nodepool_states.py
b/modules/nodepool/files/check_nodepool_states.py
index 785ec9c..7dc320a 100644
--- a/modules/nodepool/files/check_nodepool_states.py
+++ b/modules/nodepool/files/check_nodepool_states.py
@@ -92,5 +92,6 @@
print 'nodepool state management is OK'
+
if __name__ == '__main__':
main()
diff --git a/modules/openstack/files/check_keystone_projects.py
b/modules/openstack/files/check_keystone_projects.py
index 01aedd6..fb3c214 100755
--- a/modules/openstack/files/check_keystone_projects.py
+++ b/modules/openstack/files/check_keystone_projects.py
@@ -42,5 +42,6 @@
print "Keystone projects exist and have matching names and ids."
sys.exit(OK)
+
if __name__ == '__main__':
main()
diff --git a/modules/openstack/files/kilo/virtscripts/logstat.py
b/modules/openstack/files/kilo/virtscripts/logstat.py
index 8e12c81..4b2ff84 100644
--- a/modules/openstack/files/kilo/virtscripts/logstat.py
+++ b/modules/openstack/files/kilo/virtscripts/logstat.py
@@ -264,5 +264,7 @@
searches.printStats(outfile)
outfile.write("Done\n")
outfile.close()
+
+
if __name__ == "__main__":
sys.exit(main())
diff --git a/modules/openstack/files/liberty/horizon/overrides.py
b/modules/openstack/files/liberty/horizon/overrides.py
index da39fa0..b75e0db 100644
--- a/modules/openstack/files/liberty/horizon/overrides.py
+++ b/modules/openstack/files/liberty/horizon/overrides.py
@@ -150,5 +150,6 @@
usages.tally('cores', 0)
usages.tally('ram', 0)
+
from openstack_dashboard.usage import quotas
quotas._get_tenant_compute_usages = _get_tenant_compute_usages_fixed
diff --git a/modules/openstack/files/liberty/virtscripts/logstat.py
b/modules/openstack/files/liberty/virtscripts/logstat.py
index 22c3c51..ce68344 100644
--- a/modules/openstack/files/liberty/virtscripts/logstat.py
+++ b/modules/openstack/files/liberty/virtscripts/logstat.py
@@ -264,5 +264,7 @@
searches.printStats(outfile)
outfile.write("Done\n")
outfile.close()
+
+
if __name__ == "__main__":
sys.exit(main())
diff --git a/modules/openstack/files/mitaka/horizon/overrides.py
b/modules/openstack/files/mitaka/horizon/overrides.py
index 8560e03..91df1ef 100644
--- a/modules/openstack/files/mitaka/horizon/overrides.py
+++ b/modules/openstack/files/mitaka/horizon/overrides.py
@@ -151,6 +151,7 @@
usages.tally('cores', 0)
usages.tally('ram', 0)
+
from openstack_dashboard.usage import quotas
quotas._get_tenant_compute_usages = _get_tenant_compute_usages_fixed
@@ -174,5 +175,6 @@
# default to allowed
return True
+
from horizon import base as horizonbase
horizonbase.HorizonComponent._can_access = _can_access_fixed
diff --git a/modules/openstack/files/mitaka/virtscripts/logstat.py
b/modules/openstack/files/mitaka/virtscripts/logstat.py
index 4c2fb8b..beb91c9 100644
--- a/modules/openstack/files/mitaka/virtscripts/logstat.py
+++ b/modules/openstack/files/mitaka/virtscripts/logstat.py
@@ -264,5 +264,7 @@
searches.printStats(outfile)
outfile.write("Done\n")
outfile.close()
+
+
if __name__ == "__main__":
sys.exit(main())
diff --git a/modules/openstack/files/monitor_labs_salt_keys.py
b/modules/openstack/files/monitor_labs_salt_keys.py
index babb606..97e1a39 100644
--- a/modules/openstack/files/monitor_labs_salt_keys.py
+++ b/modules/openstack/files/monitor_labs_salt_keys.py
@@ -349,5 +349,6 @@
else:
print "would delete", bad_key
+
if __name__ == '__main__':
main()
diff --git a/modules/osm/files/ganglia/osm.py b/modules/osm/files/ganglia/osm.py
index 8527c63..655cdfd 100644
--- a/modules/osm/files/ganglia/osm.py
+++ b/modules/osm/files/ganglia/osm.py
@@ -14,6 +14,7 @@
global metric_results
return metric_results.get(name, 0)
+
# These are the defaults set for the metric attributes
Desc_Skel = {
"name": "N/A",
@@ -44,6 +45,7 @@
except IOError as e:
print_exception("Could not open file", e)
raise
+
metric_defs = {
"osm_sync_lag": {
@@ -131,6 +133,7 @@
def metric_cleanup():
_Worker_Thread.shutdown()
+
if __name__ == '__main__':
import argparse
diff --git a/modules/phabricator/files/phab_epipe.py
b/modules/phabricator/files/phab_epipe.py
index b3526fbd..a2afa31 100644
--- a/modules/phabricator/files/phab_epipe.py
+++ b/modules/phabricator/files/phab_epipe.py
@@ -419,6 +419,7 @@
else:
phab_handoff(stdin)
+
if __name__ == '__main__':
contact = 'Please contact a WMF Phabricator admin.'
diff --git a/modules/postgresql/files/ganglia/postgresql.py
b/modules/postgresql/files/ganglia/postgresql.py
index 0e948d4..52bfd5f 100644
--- a/modules/postgresql/files/ganglia/postgresql.py
+++ b/modules/postgresql/files/ganglia/postgresql.py
@@ -15,6 +15,7 @@
global metric_results
return metric_results.get(name, 0)
+
# These are the defaults set for the metric attributes
Desc_Skel = {
"name": "N/A",
@@ -350,6 +351,7 @@
def metric_cleanup():
_Worker_Thread.shutdown()
+
if __name__ == '__main__':
import argparse
diff --git a/modules/pybal/files/pybal-eval-check.py
b/modules/pybal/files/pybal-eval-check.py
index f5a5315..54a2a98 100644
--- a/modules/pybal/files/pybal-eval-check.py
+++ b/modules/pybal/files/pybal-eval-check.py
@@ -67,5 +67,6 @@
if not eligible_servers:
die("server pool cannot be empty!")
+
if __name__ == '__main__':
print main() or 'no issues'
diff --git a/modules/redis/files/ganglia/redis_monitoring.py
b/modules/redis/files/ganglia/redis_monitoring.py
index 07a90f0..beca8c7 100644
--- a/modules/redis/files/ganglia/redis_monitoring.py
+++ b/modules/redis/files/ganglia/redis_monitoring.py
@@ -114,6 +114,7 @@
def metric_cleanup():
pass
+
# For testing
if __name__ == "__main__":
desc = metric_init({"host": "127.0.0.1"})
diff --git a/modules/role/files/labs/db/views/maintain-meta_p.py
b/modules/role/files/labs/db/views/maintain-meta_p.py
index 07b7737..c9c3542 100644
--- a/modules/role/files/labs/db/views/maintain-meta_p.py
+++ b/modules/role/files/labs/db/views/maintain-meta_p.py
@@ -355,5 +355,6 @@
VALUES ('gadget-%'), ('language'), ('skin'), ('variant');""")
ops.write_execute("COMMIT;")
+
if __name__ == '__main__':
main()
diff --git a/modules/role/files/labs/puppet-enc.py
b/modules/role/files/labs/puppet-enc.py
index e7259b6..007dab0 100644
--- a/modules/role/files/labs/puppet-enc.py
+++ b/modules/role/files/labs/puppet-enc.py
@@ -33,6 +33,7 @@
return True
+
if __name__ == '__main__':
hostname = sys.argv[1]
project = hostname.split('.')[1]
diff --git a/modules/tlsproxy/files/utils/cipher_sim.py
b/modules/tlsproxy/files/utils/cipher_sim.py
index 4bf159e..d75ed2d 100755
--- a/modules/tlsproxy/files/utils/cipher_sim.py
+++ b/modules/tlsproxy/files/utils/cipher_sim.py
@@ -141,6 +141,7 @@
print "%-30s | %06.3f%% (%d)" % \
(kv[0], 100 * float(kv[1]) / total, kv[1])
+
if __name__ == '__main__':
main()
diff --git a/modules/toollabs/files/gridscripts/runninggridtasks.py
b/modules/toollabs/files/gridscripts/runninggridtasks.py
index 77aa1b3..ec1fd79 100755
--- a/modules/toollabs/files/gridscripts/runninggridtasks.py
+++ b/modules/toollabs/files/gridscripts/runninggridtasks.py
@@ -41,6 +41,7 @@
def groupkey(x):
return x['job_owner']
+
proc = subprocess.Popen(
['qhost', '-j', '-xml', '-h'] + sys.argv[1:],
stdout=subprocess.PIPE
diff --git a/modules/toollabs/files/kube2proxy.py
b/modules/toollabs/files/kube2proxy.py
index 49e600a..5dae300 100755
--- a/modules/toollabs/files/kube2proxy.py
+++ b/modules/toollabs/files/kube2proxy.py
@@ -219,5 +219,6 @@
for service in kubecl.services:
service.write(conn)
+
if __name__ == '__main__':
main()
diff --git a/modules/toollabs/files/proxylistener.py
b/modules/toollabs/files/proxylistener.py
index e71712c..169e0c1 100644
--- a/modules/toollabs/files/proxylistener.py
+++ b/modules/toollabs/files/proxylistener.py
@@ -127,6 +127,7 @@
self.request.close()
+
if __name__ == '__main__':
logging.log(logging.INFO, "Starting server on port %s", PORT)
server = SocketServer.ThreadingTCPServer((HOST, PORT), RouteRequestHandler)
diff --git a/modules/varnish/files/varnishlog.py
b/modules/varnish/files/varnishlog.py
index 2301420..264cd2e 100755
--- a/modules/varnish/files/varnishlog.py
+++ b/modules/varnish/files/varnishlog.py
@@ -202,6 +202,7 @@
vlog.execute()
+
if __name__ == '__main__':
args = [
('c', None),
diff --git a/modules/varnish/files/zerofetch.py
b/modules/varnish/files/zerofetch.py
index 0773856..67a4899 100755
--- a/modules/varnish/files/zerofetch.py
+++ b/modules/varnish/files/zerofetch.py
@@ -144,5 +144,6 @@
with open(success_file, 'a'):
os.utime(success_file, None)
+
if __name__ == "__main__":
main()
diff --git a/modules/wdqs/files/monitor/blazegraph.py
b/modules/wdqs/files/monitor/blazegraph.py
index 514b364..4305bac 100644
--- a/modules/wdqs/files/monitor/blazegraph.py
+++ b/modules/wdqs/files/monitor/blazegraph.py
@@ -24,6 +24,7 @@
def dst(self, dt):
return ZERO
+
utc = UTC()
diff --git a/modules/zuul/files/zuul-test-repo.py
b/modules/zuul/files/zuul-test-repo.py
index 785d008..3b790b8 100644
--- a/modules/zuul/files/zuul-test-repo.py
+++ b/modules/zuul/files/zuul-test-repo.py
@@ -61,6 +61,7 @@
'--project', repo,
'--change', '%s,%s' % (change_number, patchset)])
+
if __name__ == '__main__':
for repo in repos:
test_repo(repo)
diff --git a/utils/new_wmf_service.py b/utils/new_wmf_service.py
index 6ddd924..f327e61 100755
--- a/utils/new_wmf_service.py
+++ b/utils/new_wmf_service.py
@@ -480,5 +480,6 @@
args = parser.parse_args()
return vars(args)
+
if __name__ == "__main__":
main()
diff --git a/utils/vagrant/private b/utils/vagrant/private
new file mode 160000
index 0000000..1fd13a8
--- /dev/null
+++ b/utils/vagrant/private
@@ -0,0 +1 @@
+Subproject commit 1fd13a8a21f1abb632219a21101ef83f79f11f36
--
To view, visit https://gerrit.wikimedia.org/r/356234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75425fc791f8745e02f5663aa0c73a6f057ecf2e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
