10000 un-re-over-merge · cfmayden/server-client-python@55dd640 · GitHub
[go: up one dir, main page]

Skip to content

Commit 55dd640

Browse files
committed
un-re-over-merge
1 parent 0eed78f commit 55dd640

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

tableauserverclient/models/datasource_item.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ def datasource_type(self):
136136
def description(self):
137137
return self._description
138138

139+
@description.setter
140+
def description(self, value):
141+
self._description = value
142+
139143
@property
140144
def updated_at(self):
141145
return self._updated_at
@@ -174,7 +178,6 @@ def _parse_common_elements(self, datasource_xml, ns):
174178
_,
175179
_,
176180
_,
177-
_,
178181
encrypt_extracts,
179182
has_extracts,
180183
_,

test/assets/datasource_get_by_id.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<tsResponse xmlns="http://tableau.com/api" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tableau.com/api http://tableau.com/api/ts-api-2.3.xsd">
3-
<datasource id="9dbd2263-16b5-46e1-9c43-a76bb8ab65fb" name="Sample datasource" contentUrl="Sampledatasource" type="dataengine" createdAt="2016-08-04T21:31:55Z" updatedAt="2016-08-04T21:31:55Z" description="test-ds">
3+
<datasource id="9dbd2263-16b5-46e1-9c43-a76bb8ab65fb" name="Sample datasource" contentUrl="Sampledatasource" type="dataengine" createdAt="2016-08-04T21:31:55Z" updatedAt="2016-08-04T21:31:55Z" description="abc description xyz">
44
<project id="ee8c6e70-43b6-11e6-af4f-f7b0d8e20760" name="default" />
55
<owner id="5de011f8-5aa9-4d5b-b991-f462c8dd6bb7" />
66
<tags>

test/test_datasource.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ def test_get_by_id(self):
105105
self.assertEqual('ee8c6e70-43b6-11e6-af4f-f7b0d8e20760', single_datasource.project_id)
106106
self.assertEqual('5de011f8-5aa9-4d5b-b991-f462c8dd6bb7', single_datasource.owner_id)
107107
self.assertEqual(set(['world', 'indicators', 'sample']), single_datasource.tags)
108-
self.assertEqual("test-ds", single_datasource.description)
109108
self.assertEqual(TSC.DatasourceItem.AskDataEnablement.SiteDefault, single_datasource.ask_data_enablement)
110109

111110
def test_update(self):

0 commit comments

Comments
 (0)
0