Merge #913.

tests/test_rds2/test_rds2.py

@@ -65,6 +65,25 @@ def test_get_databases():
         'arn:aws:rds:us-west-2:1234567890:db:db-master-1')
 
 
+@disable_on_py3()
+@mock_rds2
+def test_get_databases_paginated():
+    conn = boto3.client('rds', region_name="us-west-2")
+
+    for i in range(51):
+        conn.create_db_instance(AllocatedStorage=5,
+                                Port=5432,
+                                DBInstanceIdentifier='rds%d' % i,
+                                DBInstanceClass='db.t1.micro',
+                                Engine='postgres')
+
+    resp = conn.describe_db_instances()
+    resp["DBInstances"].should.have.length_of(50)
+    resp["Marker"].should.equal(resp["DBInstances"][-1]['DBInstanceIdentifier'])
+
+    resp2 = conn.describe_db_instances(Marker=resp["Marker"])
+    resp2["DBInstances"].should.have.length_of(1)
+
 @disable_on_py3()
 @mock_rds2
 def test_describe_non_existant_database():