firebase
diff --git a/‎firebase_admin/db.py
Lines changed: 1 addition & 13 deletions b/‎firebase_admin/db.py
Lines changed: 1 addition & 13 deletions
diff --git a/‎integration/test_db.py
Lines changed: 3 additions & 5 deletions b/‎integration/test_db.py
Lines changed: 3 additions & 5 deletions
diff --git a/‎tests/test_db.py
Lines changed: 7 additions & 6 deletions b/‎tests/test_db.py
Lines changed: 7 additions & 6 deletions
@@ -125,18 +125,6 @@ def child(self, path):
         full_path = self._pathurl + '/' + path
         return Reference(client=self._client, path=full_path)
 
-    def etag(self):
-        """Returns the ETag at the current location of the database.
-
-        Returns:
-            str: ETag of the current database Reference.
-        """
-        headers = self._client.request('get', self._add_suffix(),
-                                       headers={'X-Firebase-ETag' : 'true'},
-                                       resp_headers=True,
-                                       params='print=silent')
-        return headers.get('ETag')
-
     def get(self, etag=False):
         """Returns the value, and possibly the ETag, at the current location of the database.
 
@@ -180,7 +168,7 @@ def get_if_changed(self, etag):
             new_etag = headers.get('ETag')
             return True, new_etag, value
         elif resp.status_code == 304:
-            return False, etag, None
+            return False, None, None
 
     def set(self, value):
         """Sets the data at this location to the given value.
 
@@ -150,11 +150,6 @@ def test_update_nested_children(self, testref):
         assert edward.get() == {'name' : 'Edward Cope', 'since' : 1840}
         assert jack.get() == {'name' : 'Jack Horner', 'since' : 1946}
 
-    def test_etag(self, testref):
-        python = testref.parent
-        etag = python.etag()
-        assert isinstance(etag, six.string_types)
-
     def test_get_if_changed(self, testref):
         python = testref.parent
         push_data = {'name' : 'Edward Cope', 'since' : 1800}
@@ -163,6 +158,9 @@ def test_get_if_changed(self, testref):
         assert changed_data[0]
         assert changed_data[2] == push_data
 
+        unchanged_data = edward.get_if_changed(changed_data[1])
+        assert unchanged_data == (False, None, None)
+
     def test_get_and_set_with_etag(self, testref):
         python = testref.parent
         push_data = {'name' : 'Edward Cope', 'since' : 1800}
 
@@ -34,13 +34,17 @@ def __init__(self, data, status, recorder):
 
     def send(self, request, **kwargs):
         if_match = request.headers.get('if-match')
+        if_none_match = request.headers.get('if-none-match')
         if if_match and if_match != MockAdapter._ETAG:
             response = Response()
             response._content = request.body
             response.headers = {'ETag': MockAdapter._ETAG}
             raise exceptions.RequestException(response=response)
+
         resp = super(MockAdapter, self).send(request, **kwargs)
         resp.headers = {'ETag': MockAdapter._ETAG}
+        if if_none_match and if_none_match == MockAdapter._ETAG:
+            resp.status_code = 304
         return resp
 
 
@@ -163,13 +167,10 @@ def test_get_if_changed(self, data):
         assert recorder[0].method == 'GET'
         assert recorder[0].url == 'https://test.firebaseio.com/test.json'
 
-    @pytest.mark.parametrize('data', valid_values)
-    def test_etag(self, data):
-        ref = db.reference('/test')
-        recorder = self.instrument(ref, json.dumps(data))
-        assert ref.etag() == '0'
+        assert ref.get_if_changed('0') == (False, None, None)
+        assert len(recorder) == 2
         assert recorder[0].method == 'GET'
-        assert recorder[0].url == 'https://test.firebaseio.com/test.json?print=silent'
+        assert recorder[0].url == 'https://test.firebaseio.com/test.json'
 
     @pytest.mark.parametrize('data', valid_values)
     def test_order_by_query(self, data):