Skip to content

Commit 93b681f

Browse files
committed
Fix merge conflicts after rebase.
1 parent 61ec337 commit 93b681f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spanner/unit_tests/test_pool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ def test_bind_w_timestamp_race(self):
603603
from google.cloud._testing import _Monkey
604604
from google.cloud.spanner import pool as MUT
605605
NOW = datetime.datetime.utcnow()
606-
pool = self._makeOne()
606+
pool = self._make_one()
607607
database = _Database('name')
608608
SESSIONS = [_Session(database) for _ in range(10)]
609609
database._sessions.extend(SESSIONS)

spanner/unit_tests/test_session.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ def test_constructor(self):
4444

4545
def test___lt___(self):
4646
database = _Database(self.DATABASE_NAME)
47-
lhs = self._makeOne(database)
47+
lhs = self._make_one(database)
4848
lhs._session_id = b'123'
49-
rhs = self._makeOne(database)
49+
rhs = self._make_one(database)
5050
rhs._session_id = b'234'
5151
self.assertTrue(lhs < rhs)
5252

0 commit comments

Comments
 (0)