Skip to content

Commit 7a85187

Browse files
safwanrahmansafwanrahman
committed
Fix debug
1 parent bbeeb2e commit 7a85187

File tree

3 files changed

+43
-80
lines changed

3 files changed

+43
-80
lines changed

‎django_elasticsearch_dsl/management/commands/search_index.py

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ def _get_models(self, args):
5959
for arg in args:
6060
arg = arg.lower()
6161
match_found = False
62-
print(registry.get_models())
6362

6463
for model in registry.get_models():
6564
if model._meta.app_label == arg:

‎django_elasticsearch_dsl/registries.py

-6
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ def register_document(self, document):
8181
# Update settings of the document index
8282
default_index_settings = deepcopy(DEDConfig.default_index_settings())
8383
document._index.settings(**default_index_settings)
84-
print(type(document._index))
8584

8685
# Register the document and index class to our registry
8786
self.register(index=document._index, doc_class=document)
@@ -101,11 +100,6 @@ def update_related(self, instance, **kwargs):
101100
if not DEDConfig.autosync_enabled():
102101
return
103102

104-
# print(list(self._get_related_doc(instance)))
105-
# import pdb
106-
# pdb.set_trace()
107-
print(instance.__class__, "ffff")
108-
109103
for doc in self._get_related_doc(instance):
110104
doc_instance = doc()
111105
try:

‎tests/test_commands.py

+43-73
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,22 @@ def setUp(self):
5858

5959
def test_get_models(self):
6060
cmd = Command()
61-
with patch(
62-
'django_elasticsearch_dsl.management.commands.'
63-
'search_index.registry',
64-
self.registry
65-
):
66-
self.assertEqual(
67-
cmd._get_models(['foo']),
68-
set([self.ModelA, self.ModelB])
69-
)
70-
71-
self.assertEqual(
72-
cmd._get_models(['foo', 'bar.ModelC']),
73-
set([self.ModelA, self.ModelB, self.ModelC])
74-
)
75-
76-
self.assertEqual(
77-
cmd._get_models([]),
78-
set([self.ModelA, self.ModelB, self.ModelC])
79-
)
80-
with self.assertRaises(CommandError):
81-
cmd._get_models(['unknown'])
61+
self.assertEqual(
62+
cmd._get_models(['foo']),
63+
set([self.ModelA, self.ModelB])
64+
)
65+
66+
self.assertEqual(
67+
cmd._get_models(['foo', 'bar.ModelC']),
68+
set([self.ModelA, self.ModelB, self.ModelC])
69+
)
70+
71+
self.assertEqual(
72+
cmd._get_models([]),
73+
set([self.ModelA, self.ModelB, self.ModelC])
74+
)
75+
with self.assertRaises(CommandError):
76+
cmd._get_models(['unknown'])
8277

8378
def test_no_action_error(self):
8479
cmd = Command()
@@ -88,68 +83,43 @@ def test_no_action_error(self):
8883
def test_delete_foo_index(self):
8984

9085
with patch(
91-
'django_elasticsearch_dsl.management.commands.'
92-
'search_index.registry',
93-
self.registry
86+
'django_elasticsearch_dsl.management.commands.search_index.input',
87+
Mock(return_value="y")
9488
):
95-
with patch(
96-
'django_elasticsearch_dsl.management.commands.'
97-
'search_index.input',
98-
Mock(return_value="y")
99-
):
100-
call_command('search_index', stdout=self.out,
101-
action='delete', models=['foo'])
102-
self.index_a.delete.assert_called_once()
103-
self.assertFalse(self.index_b.delete.called)
89+
call_command('search_index', stdout=self.out,
90+
action='delete', models=['foo'])
91+
self.index_a.delete.assert_called_once()
92+
self.assertFalse(self.index_b.delete.called)
10493

10594
def test_force_delete_all_indices(self):
10695

107-
with patch(
108-
'django_elasticsearch_dsl.management.commands.'
109-
'search_index.registry',
110-
self.registry
111-
):
112-
call_command('search_index', stdout=self.out,
113-
action='delete', force=True)
114-
self.index_a.delete.assert_called_once()
115-
self.index_b.delete.assert_called_once()
96+
call_command('search_index', stdout=self.out,
97+
action='delete', force=True)
98+
self.index_a.delete.assert_called_once()
99+
self.index_b.delete.assert_called_once()
116100

117101
def test_force_delete_bar_model_c_index(self):
118-
with patch.object(self.index_b, 'delete'):
119-
call_command('search_index', stdout=self.out,
120-
models=[self.ModelC._meta.label],
121-
action='delete', force=True)
122-
print(dir(self.index_b.delete))
123-
self.index_b.delete.assert_called_once()
124-
self.assertFalse(self.index_a.delete.called)
102+
call_command('search_index', stdout=self.out,
103+
models=[self.ModelC._meta.label],
104+
action='delete', force=True)
105+
self.index_b.delete.assert_called_once()
106+
self.assertFalse(self.index_a.delete.called)
125107

126108
def test_create_all_indices(self):
127-
128-
with patch(
129-
'django_elasticsearch_dsl.management.commands.'
130-
'search_index.registry',
131-
self.registry
132-
):
133-
call_command('search_index', stdout=self.out, action='create')
134-
self.index_a.create.assert_called_once()
135-
self.index_b.create.assert_called_once()
109+
call_command('search_index', stdout=self.out, action='create')
110+
self.index_a.create.assert_called_once()
111+
self.index_b.create.assert_called_once()
136112

137113
def test_populate_all_doc_type(self):
138-
139-
with patch(
140-
'django_elasticsearch_dsl.management.commands.'
141-
'search_index.registry',
142-
self.registry
143-
):
144-
call_command('search_index', stdout=self.out, action='populate')
145-
self.doc_a1.get_queryset.assert_called_once()
146-
self.doc_a1.update.assert_called_once_with(self.doc_a1_qs)
147-
self.doc_a2.get_queryset.assert_called_once()
148-
self.doc_a2.update.assert_called_once_with(self.doc_a2_qs)
149-
self.doc_b1.get_queryset.assert_called_once()
150-
self.doc_b1.update.assert_called_once_with(self.doc_b1_qs)
151-
self.doc_c1.get_queryset.assert_called_once()
152-
self.doc_c1.update.assert_called_once_with(self.doc_c1_qs)
114+
call_command('search_index', stdout=self.out, action='populate')
115+
self.doc_a1.get_queryset.assert_called_once()
116+
self.doc_a1.update.assert_called_once_with(self.doc_a1_qs)
117+
self.doc_a2.get_queryset.assert_called_once()
118+
self.doc_a2.update.assert_called_once_with(self.doc_a2_qs)
119+
self.doc_b1.get_queryset.assert_called_once()
120+
self.doc_b1.update.assert_called_once_with(self.doc_b1_qs)
121+
self.doc_c1.get_queryset.assert_called_once()
122+
self.doc_c1.update.assert_called_once_with(self.doc_c1_qs)
153123

154124
def test_rebuild_indices(self):
155125

0 commit comments

Comments
 (0)