Merge pull request julien-duponchelle#88 from lxyu/remove_default_server_id

julien-duponchelle · julien-duponchelle · commit d1df5f155a60 · 2014-09-10T17:34:55.000+02:00
remove default server_id as discussed in julien-duponchelle#80
diff --git a/pymysqlreplication/binlogstream.py b/pymysqlreplication/binlogstream.py
@@ -26,9 +26,9 @@ class BinLogStreamReader(object):
     """Connect to replication stream and read event
     """
 
-    def __init__(self, connection_settings={}, resume_stream=False,
-                 blocking=False, only_events=None, server_id=255,
-                 log_file=None, log_pos=None, filter_non_implemented_events=True,
+    def __init__(self, connection_settings, server_id, resume_stream=False,
+                 blocking=False, only_events=None, log_file=None, log_pos=None,
+                 filter_non_implemented_events=True,
                  ignored_events=None, auto_position=None):
         """
         Attributes:
diff --git a/pymysqlreplication/tests/base.py b/pymysqlreplication/tests/base.py
@@ -14,6 +14,7 @@
 else:
     base = unittest.TestCase
 
+
 class PyMySQLReplicationTestCase(base):
     def ignoredEvents(self):
         return []
@@ -74,5 +75,5 @@ def resetBinLog(self):
         self.execute("RESET MASTER")
         if self.stream is not None:
             self.stream.close()
-        self.stream = BinLogStreamReader(connection_settings=self.database,
+        self.stream = BinLogStreamReader(self.database, server_id=1024,
                                          ignored_events=self.ignoredEvents())
diff --git a/pymysqlreplication/tests/test_basic.py b/pymysqlreplication/tests/test_basic.py
@@ -60,9 +60,9 @@ def test_reading_rotate_event(self):
 
     def test_connection_stream_lost_event(self):
         self.stream.close()
-        self.stream = BinLogStreamReader(connection_settings=self.database,
-                                         blocking=True,
-                                         ignored_events=self.ignoredEvents())
+        self.stream = BinLogStreamReader(
+            self.database, server_id=1024, blocking=True,
+            ignored_events=self.ignoredEvents())
 
         query = "CREATE TABLE test (id INT NOT NULL AUTO_INCREMENT, data VARCHAR (50) NOT NULL, PRIMARY KEY (id))"
         self.execute(query)
@@ -86,8 +86,8 @@ def test_connection_stream_lost_event(self):
 
     def test_filtering_events(self):
         self.stream.close()
-        self.stream = BinLogStreamReader(connection_settings=self.database,
-                                         only_events=[QueryEvent])
+        self.stream = BinLogStreamReader(
+            self.database, server_id=1024, only_events=[QueryEvent])
         query = "CREATE TABLE test (id INT NOT NULL AUTO_INCREMENT, data VARCHAR (50) NOT NULL, PRIMARY KEY (id))"
         self.execute(query)
 
@@ -203,7 +203,8 @@ def test_log_pos(self):
         if self.stream is not None:
             self.stream.close()
         self.stream = BinLogStreamReader(
-            connection_settings=self.database,
+            self.database,
+            server_id=1024,
             resume_stream=True,
             log_file=log_file,
             log_pos=log_pos,
@@ -223,7 +224,8 @@ def test_log_pos(self):
     def test_log_pos_handles_disconnects(self):
         self.stream.close()
         self.stream = BinLogStreamReader(
-            connection_settings=self.database,
+            self.database,
+            server_id=1024,
             resume_stream=False,
             only_events = [FormatDescriptionEvent, QueryEvent, TableMapEvent, WriteRowsEvent, XidEvent]
         )
@@ -363,9 +365,8 @@ def test_read_query_event(self):
         gtid = self.execute(query).fetchone()[0]
 
         self.stream.close()
-        self.stream = BinLogStreamReader(connection_settings=self.database,
-                                         blocking=True,
-                                         auto_position=gtid)
+        self.stream = BinLogStreamReader(
+            self.database, server_id=1024, blocking=True, auto_position=gtid)
 
         self.assertIsInstance(self.stream.fetchone(), RotateEvent)
         self.assertIsInstance(self.stream.fetchone(), FormatDescriptionEvent)
@@ -420,9 +421,8 @@ def test_position_gtid(self):
         gtid = self.execute(query).fetchone()[0]
 
         self.stream.close()
-        self.stream = BinLogStreamReader(connection_settings=self.database,
-                                         blocking=True,
-                                         auto_position=gtid)
+        self.stream = BinLogStreamReader(
+            self.database, server_id=1024, blocking=True, auto_position=gtid)
 
         self.assertIsInstance(self.stream.fetchone(), RotateEvent)
         self.assertIsInstance(self.stream.fetchone(), FormatDescriptionEvent)
